Commit Graph

918 Commits

Author SHA1 Message Date
k8s-merge-robot
5c08302954 Merge pull request #26006 from euank/service-cluster-ip-range
Automatic merge from submit-queue

cluster/gce/coreos: Set service-cluster-ip-range

Broken by #19242 

See also #26002 

This is necessary to kube-up for me, but depending on how #26002 plays out, this PR might not be necessary. Happy to close this or merge or whatever depending on what's best.

cc @yifan-gu @sjpotter @mikedanese
2016-05-21 12:43:48 -07:00
k8s-merge-robot
de76bfe78c Merge pull request #22663 from yifan-gu/gce_coreos_manifests
Automatic merge from submit-queue

cluster/gce/coreos: Update addon manifests.

cc @yujuhong @timstclair @ArtfulCoder
2016-05-20 23:56:01 -07:00
Euan Kemp
6fa5a13f53 cluster/gce/coreos: Set service-cluster-ip-range 2016-05-20 17:10:17 -07:00
Mike Danese
3e5c77efea Merge pull request #25545 from freehan/kubeneton
Turn on kubenet for GCE
2016-05-20 16:38:22 -07:00
Minhan Xia
592d672b6b Turn on kubenet as default for GCE 2016-05-20 16:36:53 -07:00
Andy Zheng
728be2892a GCI: fix a breakage in controller-manager 2016-05-20 11:54:04 -07:00
mqliang
17d5a302bb make podcidr mask size configurable 2016-05-20 20:44:40 +08:00
mqliang
cf7a3475f3 Don't allow node controller to allocate into service CIDR range 2016-05-20 20:44:40 +08:00
Filip Grzadkowski
2f2b7c8c97 Merge pull request #25734 from jszczepkowski/kac-test
Added enforcing of setting nodes numbers for cluster autoscaler.
2016-05-20 10:28:56 +02:00
Wojciech Tyczynski
b294979d00 Revert "Bump GCE ContainerVM to container-v1-3-v20160517 (Docker 1.11.1)" 2016-05-20 09:02:11 +02:00
Daniel Smith
1a64ae88b7 Merge pull request #25843 from zmerlynn/container-v1-3-v20160517
Bump GCE ContainerVM to container-v1-3-v20160517 (Docker 1.11.1)
2016-05-19 16:57:13 -07:00
Daniel Smith
40f53b1765 Revert "Add support for running GCI on the GCE cloud provider" 2016-05-18 21:31:28 -07:00
Andy Zheng
a737e1eba1 Add support for running GCI on the GCE cloud provider 2016-05-18 15:15:05 -07:00
Daniel Smith
01cf9869fc Merge pull request #25504 from andyzheng0831/binary
GCI: Ensure that the right version of kubelet is used
2016-05-18 15:04:32 -07:00
k8s-merge-robot
51203dad7a Merge pull request #25763 from andyzheng0831/gci-image
Automatic merge from submit-queue

GCI: Fix the condition for using the default image

This PR revises the condition for using the default GCI image. The old logic is not convenient for manually run e2e tests in some cases (mainly for GCI team to test custom images). The new logic by this PR is very similar to the logic in using ContainerVM. When setting distro to "gci", if master or node image is unset, we use gci-dev for it. If either is set, we respect it.

@roberthbailey @zmerlynn @dchen1107 please review it, and we should cherry pick it in release-1.2 branch. Thanks!

cc/ @kubernetes/goog-image @adityakali FYI
2016-05-17 22:55:41 -07:00
Zach Loafman
4d551d640d Bump GCE ContainerVM to container-v1-3-v20160517
Bump to Docker 1.11.1
2016-05-17 14:52:16 -07:00
Yifan Gu
0a63b960ee cluster/gce/coreos: Add kubernetes-install-cni.service.
This downloads the CNI binaries and puts them into /opt/cni/bin dir.
2016-05-17 14:27:57 -07:00
Yifan Gu
faa8b105f9 cluster/gce/coreos: Use kube-addon manager pod to update addons. 2016-05-17 14:27:57 -07:00
Yifan Gu
6b358d5c4d cluster/gce/coreos: Update addon manifests. 2016-05-17 14:27:57 -07:00
Zach Loafman
87a8905b2c Fix gce/util.sh:get-master-root-disk-size 2016-05-17 13:43:17 -07:00
Andy Zheng
e47f45d1a3 GCI: Fix the condition for using the default image 2016-05-17 10:53:14 -07:00
Jerzy Szczepkowski
858eb0388e Added enforcing of setting nodes numbers for cluster autoscaler.
Added enforcing of setting nodes numbers for cluster autoscaler in kube-up script.
2016-05-17 13:15:49 +02:00
k8s-merge-robot
b7151cf4cd Merge pull request #25706 from andyzheng0831/find-cmd
Automatic merge from submit-queue

GCI/Trusty: Fix an issue in using 'find' commands

This PR makes the logic of 'find' command consistent with the 'cp' command afterwards, i.e., only check one layer of a given dir. Without this fix, we have seen a recent breakage after PR #25309 added the file cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json. The 'find' command discovers this json file, but the 'cp' command fails. 

@roberthbailey @dchen1107 @zmerlynn please review this fix, and mark it as a cherry pick candidate. I already verified this fix can resolve the breakage.

cc/ @wonderfly @fabioy @kubernetes/goog-image FYI
2016-05-17 00:42:11 -07:00
k8s-merge-robot
ced2b65046 Merge pull request #25609 from andyzheng0831/log
Automatic merge from submit-queue

GCI: Enable the log of upstart jobs

This PR enables the log of upstart jobs in master.yaml and node.yaml. By default, log of upstart jobs are enabled in Trusty and placed in /var/log/upstart, but not enabled in GCI. This change explicitly directs the log to the system logger. For trusty, they are in /var/log/syslog file. In GCI, we can check it using "journalctl". This change will be useful for debugging if cluster initialization fails.

@roberthbailey @maisem @dchen1107 please review it. This will be useful for issues like #23634. We should also cherry pick it in release-1.2

cc/ @fabioy @zmerlynn @wonderfly FYI.
2016-05-17 00:42:03 -07:00
Andy Zheng
f8739cd0c2 GCI:Trusty: Fix an issue in using 'find' commands 2016-05-16 17:48:29 -07:00
gmarek
64618c3311 Make bigger master root disks in GCE for large clusters 2016-05-16 15:57:56 +02:00
k8s-merge-robot
aada051b20 Merge pull request #25357 from mwielgus/ca-salt
Automatic merge from submit-queue

Salt configuration for the new Cluster Autoscaler for GCE

Adds support for cloud autoscaler from contrib/cloud-autoscaler in kube-up.sh GCE script.

cc: @fgrzadkowski @piosz
2016-05-15 11:35:19 -07:00
k8s-merge-robot
87403cfe7b Merge pull request #25173 from ixdy/gcloud-grep-awk-cut
Automatic merge from submit-queue

Use --format='value(name)' with gcloud instead of grep/awk/cut

Fixing our fragile parsing of `gcloud` is getting old (#24746, #25159, maybe others?).

Instead, let's just get the proper output out of `gcloud` in the first place.
2016-05-15 07:46:28 -07:00
Andy Zheng
45baf1e7cf GCI: Enable logs for upstart jobs 2016-05-13 22:29:24 -07:00
Jeff Lowdermilk
c0e12f2f96 Merge pull request #25299 from andyzheng0831/yaml
GCI/Trusty: Support the new var in glbc.yaml
2016-05-13 10:12:23 -07:00
Jeff Lowdermilk
1d67b6ca81 Merge pull request #24617 from pnegahdar/dn_server_config
Allow DNS_SERVER_IP and DNS_DOMAIN to be configurable in GCE deploy
2016-05-13 10:05:36 -07:00
Marcin Wielgus
ac4b380453 Salt configuration for the new Cluster Autoscaler for GCE 2016-05-13 17:04:24 +02:00
Saad Ali
55f7bb9c1d Merge pull request #23775 from justinsb/aws_default_variables
AWS kube-up: default some variables to empty, to avoid warnings
2016-05-12 15:47:16 -07:00
Filip Grzadkowski
bfb49d0a97 Revert "Add configuration for GCP webhook authorization." 2016-05-12 13:02:10 +02:00
k8s-merge-robot
18b124f981 Merge pull request #25296 from cjcullen/gcpauthz
Automatic merge from submit-queue

Add configuration for GCP webhook authorization.

Plumb through configuration of webhook authorization on GCE.
2016-05-11 23:45:10 -07:00
Andy Zheng
63494f6f06 GCI: Ensure that the right version of kubelet is used 2016-05-11 14:40:50 -07:00
k8s-merge-robot
91daebd951 Merge pull request #25350 from gmarek/configs-cidr
Automatic merge from submit-queue

Change default clusterCIDRs from /16 to /14 in GCE configs allowing 1000 Node clusters by default.

cc @thockin @roberthbailey @wojtek-t @zmerlynn @davidopp
2016-05-11 08:54:23 -07:00
gmarek
5dc3d50aba Change default clusterCIDRs to /14 2016-05-10 12:44:49 +02:00
Andy Zheng
74fd5d35f0 GCI/Trusty: Support the new var in glbc.yaml 2016-05-09 17:40:59 -07:00
Andy Zheng
d8314b1b9b GCI/Trusty: Fix the running of kube-addon-manager 2016-05-09 16:00:33 -07:00
CJ Cullen
de71a2a76e Add configuration for GCP webhook authorization. 2016-05-09 09:17:40 -07:00
k8s-merge-robot
f46f35a9df Merge pull request #23600 from mikedanese/addon-manager
Automatic merge from submit-queue

run kube-addon-manager in a static pod

Depends on https://github.com/kubernetes/kubernetes/pull/23605 and https://github.com/kubernetes/kubernetes/pull/24108

Ref #23233
2016-05-08 11:30:44 -07:00
k8s-merge-robot
2b46c4b7e2 Merge pull request #24391 from bprashanth/ing_templated_controller
Automatic merge from submit-queue

Template the ingress controller 

We still need https://github.com/kubernetes/contrib/pull/791 to run the controller as a static pod
ref https://github.com/kubernetes/kubernetes/issues/23663
2016-05-06 20:04:51 -07:00
Jeff Grafton
bc7922c374 Replace awkward bash pipelines with gcloud's --format='value()'
Also remove old `gcloud compute instance-groups managed get-operation`
code. This command doesn't even exist in gcloud anymore.
2016-05-06 15:49:57 -07:00
Robert Bailey
5f4f59e671 Merge pull request #24950 from andyzheng0831/apiserver
GCI/Trusty: Support ABAC authorization
2016-05-06 13:59:39 -07:00
Mike Danese
3e1c0b5951 run kube-addon-manager in a pod 2016-05-06 11:01:06 -07:00
Wojciech Tyczynski
247512d86a Fix proto configs 2016-05-06 10:25:59 +02:00
Alex Robinson
6cfaed1299 Don't surround node-tags list with square brackets
That's not how yaml list parsing works...
2016-05-05 22:05:50 +00:00
k8s-merge-robot
84573939ff Merge pull request #25105 from andyzheng0831/metadata
Automatic merge from submit-queue

GCI: Add two GCI specific metadata pairs

This PR adds two GCI specific metadata pairs when using GCI image.

(1) "gci-update-strategy": by default the GCI in-place updater is enabled. It means that when a new image is released, the instance on the old image will be upgraded to the new image. In this change, we turn it off;

(2) "gci-ensure-gke-docker": GCI is built with two versions of docker. When this metadata is set to "true", the version satisfying kubernetes qualification will be used. Setting this metadata prevents from using incorrect docker version.
2016-05-05 10:28:58 -07:00
k8s-merge-robot
ca830803f2 Merge pull request #25187 from wojtek-t/configure_proto_for_test_clusters
Automatic merge from submit-queue

Configure proto for test clusters

ref #25132

@smarterclayton - FYI
2016-05-05 06:16:40 -07:00