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

Update Kubernetes from v1.10.0 to v1.10.1

Browse Source 
* Use kubernetes-incubator/bootkube v0.12.0
This commit is contained in:
Dalton Hubble
2018-04-12 20:23:35 -07:00
parent 5035d56db2
commit 77c0a4cf2e
25 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aws/container-linux/kubernetes/cl/controller.yaml.tmpl
View File

@ -118,7 +118,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
KUBELET_IMAGE_TAG=v1.10.0
KUBELET_IMAGE_TAG=v1.10.1
- path: /etc/sysctl.d/max-user-watches.conf
filesystem: root
contents:
@ -139,7 +139,7 @@ storage:
# Move experimental manifests
[ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-*
BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.11.0}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \