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

gce: Update Kubernetes to v1.6.6

Browse Source 
* Disable locksmithd.service on hosts, the container linux
update operator will be used instead
This commit is contained in:
Dalton Hubble
2017-06-26 22:22:28 -07:00
parent c111924913
commit ddfa5e1bea
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl
View File

@ -4,12 +4,7 @@ systemd:
- name: docker.service
enable: true
- name: locksmithd.service
dropins:
- name: 40-etcd-lock.conf
contents: |
[Service]
Environment="REBOOT_STRATEGY=etcd-lock"
Environment="LOCKSMITHD_ENDPOINT=http://${k8s_etcd_service_ip}:2379"
mask: true
- name: wait-for-dns.service
enable: true
contents: |
@ -106,7 +101,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.6.4_coreos.0
KUBELET_IMAGE_TAG=v1.6.6_coreos.1
- path: /etc/sysctl.d/max-user-watches.conf
filesystem: root
contents:
@ -128,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.4.4}"
BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.4.5}"
BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \