scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-24 18:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,659 Commits 1 Branch 0 Tags
36d46e6464518ec5bb19ce10b7cdcef98d901b2d
Commit Graph

59 Commits

Author SHA1 Message Date
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
57c944caa2 Merge pull request #22434 from justinsb/aws_docker_babysitter 
Auto commit by PR queue bot
 2016-03-04 21:52:03 -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
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
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
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
Justin Santa Barbara
977a4a56e4 AWS Debian Jessie: Install Docker 1.9.1 2016-02-22 22:55:11 -05: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
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
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
Zach Loafman
6fe3023a3d Revert "Upgrade gce cluster to docker 1.9.1" 
This reverts commit f07070d129.
 2016-02-18 14:28:13 -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
Dawn Chen
f07070d129 Upgrade gce cluster to docker 1.9.1 2016-02-08 15:58:29 -08:00
k8s-merge-robot
a5f03173c5 Merge pull request #19869 from justinsb/aws_fix_docker183_package_name 
Auto commit by PR queue bot
 2016-02-01 10:18:06 -08:00
Alex Robinson
a81e6c3f4f Merge pull request #20307 from dchen1107/test1 
Deprecated soon: override /etc/init.d/docker file on containervm image,
 2016-01-30 13:32:41 -08:00
Dawn Chen
5f6f6acec7 Deprecated soon: override /etc/init.d/docker file on containervm image, 
so that we can unblock docker 1.10 validation.
 2016-01-28 17:44:23 -08:00
Dhawal Yogesh Bhanushali
f7db2c6e99 vsphere support 2016-01-24 13:52:56 -08:00
Justin Santa Barbara
32d48c619c AWS: Fix the docker-engine package name 
I got the package name wrong before, which meant that salt was failing
on invocations after the first (the name apparently doesn't matter on
the first invocation).
 2016-01-20 12:19:36 -05:00
Justin Santa Barbara
9f995df29c AWS: Use Docker 1.8.3 on Ubuntu vivid 
This currently requires downloading from the Docker repository, until we
get the packages uploaded to Google Cloud Storage.

Issue #19796
 2016-01-18 14:13:55 -05:00
Brendan Burns
b4c4a045f7 Fix an incorrect reference to the directive that installs docker 2015-12-03 15:06:33 -08:00
Zach Loafman
4b29260bc6 Bump ContainerVM to container-vm-v20151103 2015-11-03 15:44:36 -08:00
Dawn Chen
03fb74400b Upgrade to docker 1.8.3 2015-10-13 11:05:09 -07:00
Yu-Ju Hong
4cdd00fb9c Upgrade to docker 1.8.2 for Debian Wheezy on GCE 2015-09-11 10:09:59 -07:00
Dawn Chen
1932b48db3 Restore the logic of disable docker upgrade through salt for gce. 
Currently it is commented out.
 2015-08-11 14:55:58 -07:00
Dawn Chen
3901b225e3 Docker 1.7.1 2015-08-11 14:55:57 -07:00
Brendan Burns
26de8cd6b2 Merge pull request #10601 from marun/docker-pkg-f22 
Auto commit by PR queue bot
 2015-07-23 22:15:50 -07:00
Vish Kannan
919fded0f8 Merge pull request #10401 from justinsb/workaround_salt_18089 
Work around Salt 18089
 2015-07-23 16:52:21 -07:00
Victor Marmol
dd37642369 Merge pull request #10488 from justinsb/salt_support_systemd 
Salt: support systemd (don't assume Redhat <=> systemd)
 2015-07-08 13:43:08 -07:00
Brendan Burns
6d08ade4ce Don't start Docker by default on AWS 2015-07-07 21:57:43 -07:00
Justin Santa Barbara
ad0293e3f3 Salt: Add more dependencies to systemd services 
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.

Salt bug: https://github.com/saltstack/salt/issues/16778
 2015-07-03 01:40:15 -04:00
Justin Santa Barbara
bcd92c7522 Salt: support systemd (don't assume Redhat <=> systemd) 
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
 2015-07-03 01:40:15 -04:00
Maru Newby
2da59a2f34 Install 'docker' package for Fedora 22 
Fedora < 22 provides docker via the 'docker-io' package, but this
package was renamed to 'docker' as of Fedora 22.  Though the docker
package can be installed manually with 'dnf install docker-io' on F22,
Salt requires the explicit package name or deployment will fail.
 2015-06-30 21:36:33 -07:00
Justin Santa Barbara
e29e9f0033 Add explicit dependency of docker pkg on the deb download 
Salt ordering continues to surprise me.  I saw them execute
out of order, though I don't know why.  Adding an explicit
dependency to prevent out-of-order execution.
 2015-06-28 23:51:12 -04:00
Justin Santa Barbara
ea74bd13b8 Work around Salt 18089 
Directly create /etc/sysctl.d/99-salt.conf
 2015-06-28 23:50:00 -04:00
Dawn Chen
6ddfa512de Revert "Revert "Fix the race between configuring cbr0 and restarting static pods"" 
This reverts commit fd0a95dd12.
 2015-06-24 11:10:10 -07:00
Piotr Szczesniak
fd0a95dd12 Revert "Fix the race between configuring cbr0 and restarting static pods" 2015-06-24 09:56:49 +02:00
Brendan Burns
a29ade2f33 Disable creation of cbr0, the kubelet does it now. 
Conditionalize the docker bridge.
 2015-06-22 23:15:29 -07:00
derekwaynecarr
2168cee414 Upgrade to Fedora 21, Docker 1.6, clean-up SDN 2015-06-04 10:59:23 -04:00
Zach Loafman
2b3e52c230 Use built-in ContainerVM Docker version rather than installing lxc-docker 2015-05-04 16:33:00 -07:00
Dawn Chen
59a9030413 Move salt based clusters to Docker 1.5.0 2015-02-26 11:06:53 -08:00
Dawn Chen
c053ec63c5 Move salt based clusters to Docker 1.4.1 2014-12-16 15:54:26 -08:00
Dawn Chen
04b136a7db Move salt based clusters to Docker 1.4.0 2014-12-16 11:58:45 -08:00
Joe Beda
c9acafc98a Move salt based clusters to Docker 1.3.3 
Part of #2896
 2014-12-12 12:18:07 -08:00
Joe Beda
4a5a69b520 Upgrade docker to 1.3.2. 2014-11-25 14:46:25 -08:00
Joe Beda
d033dfcc2b Load etcd tarball from GCS. 
Also fix up comment about how to cache docker debs.
 2014-11-07 13:43:07 -08:00