Commit Graph

777 Commits

Author SHA1 Message Date
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
bc96422e23 Merge pull request #22571 from zmerlynn/regional-registry
Auto commit by PR queue bot
2016-03-06 13:21:19 -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
Zach Loafman
60e1fccc7f Regional registries: Hack the manifests!
Allow the gcr.io/google_containers registry to be overridden
regionally by just blasting a new KUBE_ADDON_REGISTRY out. Instead of
adding every addon to Salt and asking all of the other consumers
(Trusty, Juju, Mesos, etc) to change, just script the sed ourselves.

This is probably the 9th grossest thing I've ever done, but it works
well, and it works quickly. I kind of wish it didn't.
2016-03-04 20:00:54 -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