gce: Update Kubernetes to v1.6.6

* 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

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: |
@ -104,7 +99,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:
@ -121,7 +116,7 @@ storage:
--trust-keys-from-https \
--volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/etc/kubernetes \
quay.io/coreos/hyperkube:v1.6.4_coreos.0 \
quay.io/coreos/hyperkube:v1.6.6_coreos.1 \
--net=host \
--dns=host \
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)