Commit Graph

834 Commits (04d6162e0ff9f0ccc5dbfe9eb495a73669a13ee1)

Author SHA1 Message Date
Jeff Lowdermilk ca5b764210 Merge pull request #23876 from mikedanese/stop-to-delete
use kubectl delete in kube-addon-manager instead of stop
2016-04-08 09:30:56 -07:00
zhouhaibing089 db347beb3f add HOME env variable for kube-addons service 2016-04-07 15:39:22 +08:00
Minhan Xia f690220b5c Merge pull request #23704 from freehan/kubenet
Update cni binary

#23712 is depending on this. Not sure why this one gets in first. Hand merging this
2016-04-06 15:47:42 -07:00
Mike Danese 7b8dbf4876 use kubectl delete in kube-addon-manager instead of stop
stop has been deprecated for about a year
2016-04-05 09:31:45 -07:00
Mike Danese 32426d6e97 don't ship kube-registry-proxy and pause in tars.
pause is built into containervm. if it's not on the machine we should just pull
it. nobody that I'm aware of uses kube-registry-proxy and it makes build/deployment
more complicated and slower.
2016-04-05 07:32:07 -07:00
Matt Johnson ce220836c3 Allow for local CNI binaries and configuration files with KUBERNETES_PROVIDER=vagrant.
Files are taken from cluster/network-plugins/{bin,conf} to be consumed within a vagrant kube-up.sh environment.
Paths used for configuration files and the 'cni' name of the network provider are all from the kubernetes documentation, but the actual implementation in the salt automation doesn't seem to exist.
2016-04-04 14:38:00 +01:00
Matt Johnson 46e6df655f Support use of NETWORK_PROVIDER=cni with KUBERNETES_PROVIDER=vagrant for a kube-up.
Use of NETWORK_PROVIDER=cni is documented as useable (as well as it's affects on the runtime args of kubelet),
however the actual implimentation in the salt automation doesnt seem to exist.
this change attempts to fix that for the vagrant usecase.
2016-04-04 14:37:48 +01:00
k8s-merge-robot 5be819b607 Merge pull request #23612 from mikedanese/addon-fix
Automatic merge from submit-queue

use apply instead of create to setup namespaces and tokens in addon manager

when the addon manager restarts, it takes ~15 minutes (1000 seconds) to start the sync loop because it retries creation of namespace and tokens 100 times. Create fails if the tokens already exist. Just use apply.
2016-04-03 05:50:12 -07:00
k8s-merge-robot b448825211 Merge pull request #23603 from mikedanese/dont-create-secret-for-dns
Automatic merge from submit-queue

stop creating secrets for dns, it uses the kube-system service account now
2016-04-02 17:20:52 -07:00
Minhan Xia d026d7ecbc Update cni binary 2016-03-31 13:57:51 -07:00
Alex Robinson b60ef6f0dd Merge pull request #23593 from dchen1107/docker
Remove unnecessary override of /etc/init.d/docker on containervm image.
2016-03-31 13:31:52 -07:00
Alex Robinson d41d50547d Merge pull request #23662 from ArtfulCoder/dockerscript
make docker-checker more robust
2016-03-31 10:53:39 -07:00
Abhishek Shah 736c02c7a0 make docker-checker more robust 2016-03-31 10:07:37 -07:00
CJ Cullen 26a6c66de5 Change kube-proxy & fluentd CPU request to 20m/80m. 2016-03-30 18:14:24 -07:00
k8s-merge-robot c327879771 Merge pull request #23512 from Q-Lee/nanny-fix
Automatic merge from submit-queue

Create a new Deployment in kube-system for every version.

It appears that version numbers have already been properly added to these files. Small change to delete an old deployment entirely, so we can make a new one per version (like replication controllers).

We'll want to change this back once the kube-addons support deployments in a later version.
2016-03-29 20:59:46 -07:00
Mike Danese ffa8bbde72 use apply instead of create to setup namespaces and tokens in addon manager 2016-03-29 16:41:53 -07:00
Mike Danese 0a821a473d stop create secrets for dns, it uses the kube-system service account now 2016-03-29 14:27:28 -07:00
Quintin Lee 0dcd49d584 Create a new Deployment in kube-system for every version. 2016-03-29 13:26:36 -07:00
Dawn Chen c5ac60f584 Remove unnecessary override of /etc/init.d/docker on containervm image. 2016-03-29 12:35:13 -07:00
k8s-merge-robot 3ec9f1e0a1 Merge pull request #23312 from mikedanese/static-routes-salt
Auto commit by PR queue bot
2016-03-26 12:29:40 -07:00
Yaroslav Molocko 0bfc496496 fix for https://github.com/kubernetes/kubernetes/issues/13511 2016-03-25 22:29:09 +08:00
Mike Danese be5b669b45 remove cadvisor salt
We have been removing cadviosr.manifest for over a year to cleanup
the old deployment style. I think we are ok at this point.
2016-03-24 11:55:29 -07:00
k8s-merge-robot cba5efd7de Merge pull request #23311 from mikedanese/nginx-salt
Auto commit by PR queue bot
2016-03-23 04:14:17 -07:00
Quintin Lee c484563315 Removing versions from deployment names. 2016-03-22 13:17:06 -07:00
Quintin Lee 79f0cc25e8 Support addon Deployments, make heapster a deployment with a nanny. 2016-03-22 13:17:06 -07:00
Mike Danese c676f8dabb remove unused static-routes from salt 2016-03-21 17:38:08 -07:00
Mike Danese 172d4e27f1 remove unused nginx salt
'aws', 'gce', 'vagrant', 'vsphere' are all the cloud providers
2016-03-21 17:25:31 -07:00
Justin Santa Barbara e0caa1e559 non_masquerade_cidr: verify-flags exception, salt syntax
Cope is non_masquerade_cidr value is empty; add exception for
verify-flags.
2016-03-15 11:05:55 -04:00
Matt Margolin e752f2149f Enable non_masquerade_cidr option configured in salt.grains
This should allow allow the non_masquerade_cidr option to get configured
in /etc/salt/minion.d/grains.conf, allowing the flag to used by kubelet
in /etc/sysconfig/kubelet. Default configuration is set in pillar
2016-03-15 09:56:33 -04:00
k8s-merge-robot 5191cfc415 Merge pull request #20931 from gswallow/master
Auto commit by PR queue bot
2016-03-07 06:18:53 -08:00
k8s-merge-robot 0a21fa06d9 Merge pull request #22539 from a-robinson/newf
Auto commit by PR queue bot
2016-03-05 08:26:59 -08:00
k8s-merge-robot 886c943379 Merge pull request #22367 from a-robinson/requests
Auto commit by PR queue bot
2016-03-05 06:18:14 -08:00
k8s-merge-robot 271784e5fa Merge pull request #21167 from andyzheng0831/trusty-release
Auto commit by PR queue bot
2016-03-05 01:57:52 -08:00
k8s-merge-robot 57c944caa2 Merge pull request #22434 from justinsb/aws_docker_babysitter
Auto commit by PR queue bot
2016-03-04 21:52:03 -08:00
Abhi Shah 506f4d2212 Merge pull request #22551 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-04 16:50:19 -08:00
Alex Robinson 3216204668 Update to the latest version of google-fluentd.
It includes some performance improvements for parsing JSON (which is
very important for us, since all Docker logs are JSON) as well as a
couple new settings, like forcing of a flush of multiline logs after a
time period rather than having to wait until a new log is seen before
feeling confident flushing the previous one.
2016-03-05 00:18:31 +00:00
Alex Robinson 4e729c6c7c Reconfigure fluentd's resource limits and requests.
-Remove CPU limits to enable CPU bursting once 1.2 begins enforcing CPU limits.
-Add a memory limit for fluentd-es to match fluentd-gcp.
-Explicitly set requests to match limits.
2016-03-04 16:16:35 -08:00
k8s-merge-robot 23aa8565e2 Merge pull request #20851 from vmware/vsphere-docker-version-fix
Auto commit by PR queue bot
2016-03-04 15:50:36 -08:00
Dawn Chen fd10ca2f45 Enable --log-level=info for docker daemons for jenkins jobs and e2e tests except soak-continuous. 2016-03-04 13:31:42 -08:00
Andy Zheng 242b9977c7 Remove manifest copies from Trusty support
This change revises the way to provide kube-system manifests for clusters on Trusty. Originally, we maintained copies of some manifests under cluster/gce/trusty/kube-manifests, which is not scalable and hard to maintain. With this change, clusters on Trusty will use the same source of manifests as ContainerVM. This change also fixes some minor problems such as shell variables and comments to meet the style guidance better.
2016-03-04 11:16:49 -08:00
Justin Santa Barbara 6bdab05d11 Salt: Don't use Salt to start Docker
Starting docker through Salt has always been problematic.  Kubelet or
the babysitter process should start it.  We've kept it around primarily
so we have a `service: docker` node for the Salt DAG.

Instead, we enable (but do not start) the Docker service in Salt.  This
lets us keep the DAG node, but won't start it.

There's another bug in Salt, where watches will start the service even
on `service.enabled`.  So we remove the watches, and move them to our
existing Salt bug-fix script.
2016-03-04 12:07:10 -05:00
Justin Santa Barbara dbff0ef67b Systemd/non-Redhat: Add docker healthcheck script
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara 64f1cbaddd Systemd/non-Redhat: Add docker prestart file
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara d074b5ba13 docker systemd file: type->notify, docs->https
This minimizes the changes we make to the official Docker systemd file.
2016-03-04 12:05:52 -05:00
Alex Robinson 29eb6020fb Merge pull request #22074 from a-robinson/images
Update the logging images to parse sub-second docker timestamps.
2016-03-04 09:04:33 -08:00
k8s-merge-robot 09313b0847 Merge pull request #22254 from vmware/vsphere-pod-cidr-fix
Auto commit by PR queue bot
2016-03-04 04:17:44 -08:00
k8s-merge-robot 6d690d3f8a Merge pull request #21904 from justinsb/salt_docker_install_fix
Auto commit by PR queue bot
2016-03-03 22:07:14 -08:00
Jeff Lowdermilk 93e14a63e8 Revert "Enable --log-level=info for docker daemons for scalability jenkins jo…" 2016-03-03 19:21:11 -08:00
Jeff Lowdermilk 7215860ecd Merge pull request #22453 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-03 16:29:34 -08:00
Dawn Chen 84689a7a69 Enable --log-level=info for docker daemons for scalability jenkins job and e2e test. 2016-03-03 11:11:56 -08:00
Alex Robinson feea376b5c Update the logging images to parse sub-second docker timestamps. 2016-03-03 10:21:30 -08:00
Justin Santa Barbara 4ce0f8ccec Salt: bypass Salt when installing docker package on debian
The Docker 1.9.1 package on Debian is broken, and the service fails to
install when run unattended.  This is treated as an installation failure
and causes everything to fail.

However, the service can be started by Salt once we're not installing
the package, and indeed we restart docker anyway.

So, on Debian, use a helper script to install the docker package.  The
script sets up a policy-rc.d file to prevent the service starting, and
then cleanly removes it afterwards (this would be difficult to do in
Salt, I believe).
2016-03-03 11:14:33 -05:00
Zach Loafman 820842036b Show LICENSES in /etc/motd
Plumb through from the server tarball to
/usr/local/share/docs/kubernetes/LICENSES, then display in the motd.
2016-03-02 15:23:17 -08:00
Dhawal Yogesh Bhanushali fe7568d099 cidr-fix for vsphere cloud provider
let kubelet configure cbr0 bridge.
let kube-controll-manager distributed the subnet across the nodes.
create routes for the pod network.
2016-03-02 12:52:56 -08:00
Dawn Chen 960bea324e set --babysit-daemons=true for gce and aws 2016-03-01 16:46:31 -08:00
Dawn Chen a90ac42dd8 Kill docker daemon after configing cbr0 if flag --babysit-daemon is true so that babysitter process can restart it again with proper configurations and checkpoint file. 2016-03-01 16:46:31 -08:00
k8s-merge-robot a0b04a6df8 Merge pull request #20281 from cilium-team/fixing-docker-d
Auto commit by PR queue bot
2016-02-28 03:51:31 -08:00
Prashanth Balasubramanian 7d47d2dcd8 Kube-proxy requests 2x cpu shares of addons. 2016-02-25 15:39:27 -08:00
Justin Santa Barbara 977a4a56e4 AWS Debian Jessie: Install Docker 1.9.1 2016-02-22 22:55:11 -05:00
Prashanth B c833a14898 Merge pull request #21727 from dchen1107/test
Remove potential corrupted docker network checkpoint file before star…
2016-02-22 17:52:16 -08:00
Dawn Chen d922ddef8c Remove potential corrupted docker network checkpoint file before start docker
again.
2016-02-22 17:08:31 -08:00
k8s-merge-robot 8afccef608 Merge pull request #21632 from justinsb/docker_191
Auto commit by PR queue bot
2016-02-22 16:16:51 -08:00
Dhawal Yogesh Bhanushali e1a7441b36 restricting the version of docker to 1.9.x for vsphere support
for vsphere provider docker currently only supports 1.9.1 release.
The older versions of docker are failing on jessie due to issue https://github.com/docker/docker/issues/18793
and newer version 1.10.x is not properly tested.
2016-02-22 16:03:17 -08:00
Jeff Lowdermilk c406665b2b Plumb node labels through salt
Expose node-labels flag on kubelet for gce via a startup script
env var.
2016-02-22 15:31:34 -08:00
Dawn Chen 699c80b752 Merge pull request #21641 from bprashanth/promisc
Teach the kubelet about promiscuous mode, take 2
2016-02-22 15:08:18 -08:00
Dawn Chen b58826292a Merge pull request #21703 from dchen1107/test
Make sure docker is properly shutdown before startup.
2016-02-22 13:35:24 -08:00
Dawn Chen 6c5f07d58e Make sure docker is properly shutdown before startup. 2016-02-22 12:57:42 -08:00
k8s-merge-robot e629ee6bd3 Merge pull request #20704 from FujitsuEnablingSoftwareTechnologyGmbH/centos-support
Auto commit by PR queue bot
2016-02-22 02:35:22 -08:00
Lukasz Zajaczkowski 82be3d08f3 Add CentOS support 2016-02-22 07:41:35 +01:00
k8s-merge-robot facd8617ce Merge pull request #21505 from bprashanth/flannel-etcd
Auto commit by PR queue bot
2016-02-21 18:09:12 -08:00
Prashanth Balasubramanian c97e8df65b Stricter checking of HAIRPIN_FLAG in salt. 2016-02-21 14:43:43 -08:00
Prashanth Balasubramanian 2e8ff81de1 Teach the kubelet about --hairpin-mode=promiscuous-bridge. 2016-02-20 22:40:54 -08:00
k8s-merge-robot 0f1043d6df Merge pull request #21299 from wojtek-t/always_event_etcd
Auto commit by PR queue bot
2016-02-20 21:03:27 -08:00
Justin Santa Barbara dda792304d AWS Salt: Update to trusty, vivid, wily to Docker 1.9.1
This updates all of our recognized Ubuntu images to use Docker 1.9.1
2016-02-20 17:31:19 -05:00
k8s-merge-robot a12a2e984a Merge pull request #21233 from justinsb/aws_wily
Auto commit by PR queue bot
2016-02-20 13:28:08 -08:00
Daniel Smith a8b943dddd Revert "Put the container bridge in promiscuous mode." 2016-02-19 23:14:53 -08:00
Prashanth B b36e046fc8 Merge pull request #21326 from bprashanth/cbr0_promisc
Put the container bridge in promiscuous mode.
2016-02-19 17:52:34 -08:00
Joe Beda 11c7068b74 Merge pull request #21142 from justinsb/install_git_package
Salt: Make sure git is installed, for gitRepo volumes
2016-02-19 15:42:00 -08:00
Prashanth Balasubramanian a694a7ae4b Teach the kubelet about --hairpin-mode=promiscuous-bridge. 2016-02-19 14:59:16 -08:00
Brendan Burns 8bda033ef1 Merge pull request #21444 from dchen1107/test1
Log daemons' failure reasons to supervisord log files
2016-02-19 13:08:19 -08:00
k8s-merge-robot ced1ddfcc7 Merge pull request #21428 from ArtfulCoder/fluentes
Auto commit by PR queue bot
2016-02-19 08:56:10 -08:00
k8s-merge-robot 841d3f8311 Merge pull request #21357 from WeixuZhuang/fix
Auto commit by PR queue bot
2016-02-19 02:14:51 -08:00
Zach Loafman 6fe3023a3d Revert "Upgrade gce cluster to docker 1.9.1"
This reverts commit f07070d129.
2016-02-18 14:28:13 -08:00
Prashanth Balasubramanian 1e3db8ef9e Don't impose a memory limit on flannel etcd. 2016-02-18 13:52:58 -08:00
k8s-merge-robot 10f3403536 Merge pull request #21362 from ArtfulCoder/fluentd
Auto commit by PR queue bot
2016-02-17 22:25:28 -08:00
Dawn Chen 14f8ae1340 Log kubelet /healthz failure reasons to supervisord log file 2016-02-17 16:42:47 -08:00
Phillip Wittrock a8744279eb Merge pull request #21347 from yujuhong/health_check
Switch to using `docker version` as health check
2016-02-17 14:48:44 -08:00
Abhishek Shah e46b17044f Disable fluent-es on kubernetes-master 2016-02-17 14:01:20 -08:00
Abhishek Shah 51fba282ec Fluentd on GCE master should not use ClusterFirst 2016-02-17 11:32:41 -08:00
Justin Santa Barbara 4d2c580781 AWS kube-up: Add support for wily
vivid is technically no longer supported now, so we should support
wily.
2016-02-17 10:45:21 -05:00
Vishnu kannan 202578ebe5 enable for *real* new runtime and kubelet cgroup configs in GCE salt configs.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-16 16:08:57 -08:00
weixu b3f3a80667 Set the default value for DEBUG in cluster/saltbase/salt/generate-cert/make-ca-cert.sh
In commit 07d7cfd3, people add ${DEBUG} == "true" in file
cluster/saltbase/salt/generate-cert/make-ca-cert.sh
But the default value for DEBUG is not set. In that commit, it set the value
of DEBUG in cluster/ubuntu/util.sh where it call this script. When using this
script in saltstack to bring up cluster in other cloud platforms, it will fail
to generate the cert since we set set -o nounset in make-ca-cert.sh and var DEBUG
does not set. Set a default value for DEBUG here will fix this problem.
2016-02-16 16:03:20 -08:00
Yu-Ju Hong b92e2903fa Switched to using `docker version` as health check
`docker ps` can sometimes take a long time to finish, and restarting
docker in this case doesn't help.
2016-02-16 15:10:15 -08:00
k8s-merge-robot 4f3c89ce81 Merge pull request #21132 from petermd/kubeaddon-api-status
Auto commit by PR queue bot
2016-02-16 02:57:17 -08:00
Wojciech Tyczynski f6dc06bdc7 Always enable second etcd for events 2016-02-16 11:48:46 +01:00
k8s-merge-robot 396287aad9 Merge pull request #21110 from MikeSpreitzer/issue/21037
Auto commit by PR queue bot
2016-02-15 01:15:20 -08:00
André Martins 97acdf4cd8 fixing docker -d deprecation
Signed-off-by: André Martins <aanm90@gmail.com>
2016-02-14 23:07:32 +01:00
k8s-merge-robot 3d93b594e3 Merge pull request #20062 from mikefaille/master
Auto commit by PR queue bot
2016-02-13 10:36:57 -08:00
Dawn Chen 54933902b2 Make master component pods burstable, instead of guaranteed. 2016-02-12 14:28:48 -08:00
Mike Spreitzer 07d7cfd346 Fetch hacked easyrsa in kube-up instead of command run on master
This is good because it removes an obstacle to using the
cluster/ubuntu scripting to install Kubernetes into a restricted
environment where the machines can not open connections to arbitrary
external locations.

Also add debuggability to make-ca-cert.sh

Resolves #21037
Resolves #21092
2016-02-12 14:11:53 -05:00