Commit Graph

4091 Commits (6108725869a1fc68a5b7d0ecd3b7770713ace77c)

Author SHA1 Message Date
k8s-merge-robot 36c07cc554 Merge pull request #27961 from maisem/os-distribution
Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-15 14:11:47 -07:00
Maisem Ali 97f3f80833 Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and
MASTER_OS_DISTRIBUTION.
2016-07-15 12:02:31 -07:00
Mike Danese 95e2e299a9 move kube-dns to the cluster/addons/ directory 2016-07-14 11:44:00 -07:00
k8s-merge-robot ae990defcf Merge pull request #26956 from joe2far/fix-typos
Automatic merge from submit-queue

Fixed several typos
2016-07-14 04:13:15 -07:00
k8s-merge-robot febd37b148 Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests
Automatic merge from submit-queue

Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set

fixes #26269
same as #26530 - i accidentally lost my fork and couldn't rebase there ;)
@mikedanese PTAL
2016-07-14 02:53:08 -07:00
k8s-merge-robot 5b92ee2155 Merge pull request #28823 from zenly/master
Automatic merge from submit-queue

ConfigMap added to kube addon manager

fixes #28775
2016-07-13 16:43:19 -07:00
k8s-merge-robot f9a45e6983 Merge pull request #28673 from cheld/add-cni-config
Automatic merge from submit-queue

add default flannel configuration for cni

I added a default flannel configuration for cni.

So hyperkube can be started with:
```
--network-plugin=kubenet
```
or with flannel:

```
--network-plugin=cni
--network-plugin-dir=/etc/cni/net.d
```

Requires update of cni binaries to 0.3.0 or later to work. See also https://github.com/kubernetes/kubernetes/issues/27603

This PR is intended to support multi-node Hyperkube 
https://github.com/kubernetes/kube-deploy/pull/115



CC @zreigz  

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 14:42:07 -07:00
k8s-merge-robot 783aa1a28b Merge pull request #28872 from lojies/sshoptadd
Automatic merge from submit-queue

Add SSH_OPTS to config ssh and scp port

Add SSH_OPTS support.This can change ssh and scp default port.

fixes #17934
2016-07-13 12:54:25 -07:00
k8s-merge-robot 753ba9f6fe Merge pull request #28806 from silasbw/ubuntu-version-0
Automatic merge from submit-queue

cluster/ubuntu/download-release.sh: if $KUBE_VERSION is set, use it.

```release-note
If $KUBE_VERSION is set in cluster/ubuntu/download-release.sh use that version, 
otherwise set it to the result of `get_latest_version_number`.
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 12:54:20 -07:00
k8s-merge-robot 2906a35c1a Merge pull request #28745 from justinsb/fix_28644
Automatic merge from submit-queue

kube-up: install new Docker pre-requisite (libltdl7) when not in image

Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes #28644
2016-07-13 10:17:15 -07:00
joe2far 5ead89b5bb Fixed several typos 2016-07-13 15:06:24 +01:00
Tim Hockin 9613e15801 Make releases work 2016-07-12 21:52:54 -07:00
Tim Hockin 881e21c2d5 Link _output/bin/ to real binaries for this arch
This makes followup commits easier wrt finding binaries during build.
2016-07-12 21:52:00 -07:00
Tim Hockin faeef5c4ae Use make as the main build tool
This allows us to start building real dependencies into Makefile.

Leave old hack/* scripts in place but advise to use 'make'.  There are a few
rules that call things like 'go run' or 'build/*' that I left as-is for now.
2016-07-12 21:52:00 -07:00
lojies b00902c9f7 Add SSH_OPTS to config ssh and scp port 2016-07-13 09:42:27 +08:00
Mike Danese c5b5e1f28e fix image staging to non gcr.io repos 2016-07-12 13:46:00 -07:00
Silas Boyd-Wickizer 35e190e6ae cluster/ubuntu/download-release.sh: if $KUBE_VERSION is set, use it.
If $KUBE_VERSION is not set, set it to the result of
`get_latest_version_number`.
2016-07-11 16:29:00 -07:00
Minhan Xia 0bd411878a bump cni version 2016-07-11 14:33:01 -07:00
Pawel Skrzynski 50751f73ab Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set 2016-07-11 18:43:37 +02:00
Douglas Gibbons 2a589b0963 ConfigMap added to kube addon manager. 2016-07-11 13:54:18 +01:00
Justin Santa Barbara 4bde831fad kube-up: install libltdl7 when installing docker with dpkg
Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes #28644
2016-07-10 19:45:41 -04:00
k8s-merge-robot f83f21f399 Merge pull request #28623 from elsonrodriguez/openstack-release-tar-fix
Automatic merge from submit-queue

Fixes #28205, Check release tar location for Openstack-Heat provider

This does a basic check to see where the release tars are located.

Allows people to use openstack-heat outside of compiling k8s.
2016-07-08 13:32:14 -07:00
Elson Rodriguez fbd0ba074e Fixes #28205, Check release tar location for Openstack-Heat provider
This does a basic check to see where the release tars are located.

Allows people to use openstack-heat outside of compiling k8s.
2016-07-08 08:45:47 -07:00
Christoph Held d659c16eb4 add default flannel configuration for cni 2016-07-08 11:36:17 +02:00
k8s-merge-robot 2296108886 Merge pull request #28549 from caseydavenport/cd-default-netpol
Automatic merge from submit-queue

Enable extensions/v1beta1/NetworkPolicy by default

Fixes https://github.com/kubernetes/kubernetes/issues/28401

For some reason this also triggered an update to the swagger spec (which apparently hadn't been done before but wasn't failing validation...)
2016-07-08 01:39:15 -07:00
k8s-merge-robot 9fb45943b5 Merge pull request #28467 from gmarek/addon-manager
Automatic merge from submit-queue

Fix the way addon-manager handles non-namespaced objects

Fixes #28451

cc @wojtek-t
2016-07-07 13:56:21 -07:00
allenmiller 727bd438de Remove unbalanced right-paren 2016-07-07 11:06:01 -07:00
Casey Davenport 097e186e84 Remove --runtime-config logic from kube-up 2016-07-07 10:04:46 -07:00
k8s-merge-robot acda24ae25 Merge pull request #27805 from janetkuo/change-redis-image-gcr
Automatic merge from submit-queue

Change redis image gcr

Follow up https://github.com/kubernetes/kubernetes/pull/27577#discussion_r67809871:
> Any chance we can move these images somewhere in gcr.io?

I pushed `kubernetes/redis:v1` to `gcr.io/google_containers/redis:v1`.  


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-07 00:53:44 -07:00
Madhusudan.C.S 2e308035f0 Copy FEDERATIONS_DOMAIN_MAP to a local variable since the helper script doesn't allow overwriting the existing variable. 2016-07-06 15:53:45 -07:00
Janet Kuo 6a60f8e542 Moving kubernetes/redis:v1 image to gcr.io 2016-07-06 11:03:38 -07:00
k8s-merge-robot 203e1e9663 Merge pull request #26446 from mbruzek/juju-master-worker
Automatic merge from submit-queue

Implementing a proper master/worker split in the juju cluster code.

```
release-note-none
```

General updates to the cluster/juju Kubernetes provider, to bring it up to date.

Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-05 18:50:40 -07:00
k8s-merge-robot 5e7c309b29 Merge pull request #25473 from andreykurilin/get_kube
Automatic merge from submit-queue

Check existence of kubernetes dir for get-kube.sh

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

There are a lot of references to https://get.k8s.io/ over the internet.
Most of such references do not describe KUBERNETES_SKIP_DOWNLOAD env variable
and newbies can get into a situation described below:

- execute `wget -q -O - https://get.k8s.io | bash`
- receive a failure due too missed packages or some configs
- fix the issue
- try again `wget -q -O - https://get.k8s.io | bash`

In this case, get-kube.sh will not check that kubernetes directory already
exist and repeat download again.
Lets make get-kube.sh more user-friendly and check existence of kubernetes dir
2016-07-05 11:27:47 -07:00
Matt Bruzek b45002b2b2 Implementing a proper master/worker split in k8s.py
Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.
Fixing underscore problem and adding exceptions.

Fixing the underscore flag errors.
2016-07-05 11:16:41 -05:00
gmarek 0c60cfc98d Fix the way addon-manager handles non-namespaced objects 2016-07-05 10:37:30 +02:00
k8s-merge-robot 85f75daf25 Merge pull request #28268 from cjcullen/expr
Automatic merge from submit-queue

Make GKE detect-instance-groups work on Mac.

Make the fix from #27803 also work on mac.

The GNU `expr` command supports both the `expr match STRING REGEXP` and `expr STRING : REGEXP` command syntax.

The BSD `expr` command only has the `expr STRING : REGEXP` syntax.

@fabioy @a-robinson
2016-07-01 21:41:11 -07:00
k8s-merge-robot c3e9485dfa Merge pull request #28247 from girishkalele/skydns_godep_up
Automatic merge from submit-queue

Bump skydns godeps to latest

Update Godeps for github.com/skynetservices/skydns and miekg/dns.

Bump kubedns version to 1.6 with latest skynetservices/skydns code
    
Built kube-dns for all architectures and pushed containers to gcr.io.
2016-06-30 11:19:46 -07:00
Girish Kalele 8614be3c71 Bump kubedns version to 1.6 with latest skynetservices/skydns code
Built kube-dns for all architectures and pushed containers to gcr.io
2016-06-30 10:45:00 -07:00
CJ Cullen 65ab7040a7 Make GKE detect-instance-groups work on Mac. 2016-06-29 22:49:26 -07:00
k8s-merge-robot f2ddd60eb9 Merge pull request #26755 from david-mcmahon/fix-headers
Automatic merge from submit-queue

Remove "All rights reserved" from all the headers.

cc @thockin @zmerlynn @brendanburns
2016-06-29 18:46:07 -07:00
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
Zach Loafman 2d6c632de2 Revert "Revert "Merge pull request #28193 from zmerlynn/pull-ci-elsewhere""
Bring back #28193. We caught a break in
https://github.com/kubernetes/test-infra/issues/240 and discovered the
previous issue, fixed in
https://github.com/kubernetes/test-infra/pull/241 and
https://github.com/kubernetes/test-infra/pull/244, so I have a pretty
good handle on what was causing the previous bringup issues (and it
wasn't #28193). By the time this merges, we'll have good signal on GKE
in the `kubernetes-e2e-gke-updown` job.

This reverts commit ee1d480333.
2016-06-29 15:10:24 -07:00
k8s-merge-robot 9aff7d9e8b Merge pull request #27652 from girishkalele/kubedns_healthz
Automatic merge from submit-queue

Enhance kubedns pod health checks to cover kubedns container

The existing health check hits port 53, the dnsmasq container, with the same domain name every time. Since dnsmasq looks up and caches results from the kubedns container, running on port 10053, the health check is not covering the kubedns container after the first query (and once every TTL expiration).

This PR enhances the health check to directly hit port 10053 (kubedns) in addition to port 53.
2016-06-29 14:58:17 -07:00
k8s-merge-robot 3a6494e9ae Merge pull request #28132 from madhusudancs/fed-kubedns-flags-nodebootstrap
Automatic merge from submit-queue

Substitute federation_domain_map parameter with its value in node bootstrap scripts.

This PR also removes the substitution code we added to the build scripts.

**Release Note**

```release-note
If you use one of the kube-dns replication controller manifest in `cluster/saltbase/salt/kube-dns`, i.e. `cluster/saltbase/salt/kube-dns/{skydns-rc.yaml.base,skydns-rc.yaml.in}`, either substitute one of `__PILLAR__FEDERATIONS__DOMAIN__MAP__` or `{{ pillar['federations_domain_map'] }}` with the corresponding federation name to domain name value or remove them if you do not support cluster federation at this time. If you plan to substitute the parameter with its value, here is an example for `{{ pillar['federations_domain_map'] }`
pillar['federations_domain_map'] = "- --federations=myfederation=federation.test"
where `myfederation` is the name of the federation and `federation.test` is the domain name registered for the federation.
```

cc @erictune  @kubernetes/sig-cluster-federation @MikeSpreitzer @luxas 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-29 14:09:46 -07:00
k8s-merge-robot 594e4d883c Merge pull request #27468 from aledbf/remove-duplicated-nginx-image
Automatic merge from submit-queue

Remove duplicated nginx image. Use nginx-slim instead

This PR removes the image `gcr.io/google_containers/nginx:1.7.9` and uses `gcr.io/google_containers/nginx-slim:0.7`.
Besides removing the duplication `1.7.9` is 16 months old.
2016-06-29 12:43:38 -07:00
Zach Loafman ee1d480333 Revert "Merge pull request #28193 from zmerlynn/pull-ci-elsewhere"
This reverts commit d965b4719c, reversing
changes made to 08a28e5123.
2016-06-29 07:55:53 -07:00
k8s-merge-robot d4e6064b70 Merge pull request #28109 from jszczepkowski/influx-ps
Automatic merge from submit-queue

Influxdb migrated to PetSet and PersistentVolumes.

```release-note
Influxdb migrated to PetSet and PersistentVolumes.
```
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Influxdb migrated to PetSet and PersistentVolumes.
2016-06-29 05:02:15 -07:00
Marcin Wielgus d7eaad95c4 Merge pull request #28207 from mwielgus/ca-0.2.2
Bump cluster autoscaler to 0.2.2
2016-06-29 10:29:48 +02:00
Zach Loafman 92485326b1 Change references to gs://kubernetes-release/ci
Change over to gs://kubernetes-release-dev/ci. This should be all the
places we reference gs://kubernetes-release/ci or
https://storage.googleapis.com/kubernetes-release/ci. I'm happy to be
wrong.

Follow-on to #28172
2016-06-28 16:45:12 -07:00
k8s-merge-robot a0c4912648 Merge pull request #28131 from yujuhong/docker_debug
Automatic merge from submit-queue

Enable the docker debug mode in a e2e test cluster

This helps debugging a test cluster (e.g., #28124).
2016-06-28 16:33:30 -07:00