CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-20 00:11:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Kubernetes from v1.7.1 to v1.7.3

Browse Source
This commit is contained in:
Dalton Hubble
2017-08-16 18:28:38 -07:00
parent fc018ffa28
commit dc3ff174ea
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
google-cloud/container-linux/controllers/cl/controller.yaml.tmpl
View File

@ -101,7 +101,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.7.1_coreos.0
KUBELET_IMAGE_TAG=v1.7.3_coreos.0
- path: /etc/sysctl.d/max-user-watches.conf
filesystem: root
contents:
@ -123,7 +123,7 @@ storage:
[ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests
[ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests
BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.0}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.6.1}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \