github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-12 21:40:29 +00:00
Code Issues Projects Releases Wiki Activity
27,744 Commits 42 Branches 8,159 Tags
80901a554272f73c323a4a07868ccbfb51a805fb
Commit Graph

812 Commits

Author SHA1 Message Date
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