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

View File

@ -4,12 +4,7 @@ systemd:
- name: docker.service - name: docker.service
enable: true enable: true
- name: locksmithd.service - name: locksmithd.service
dropins: mask: true
- name: 40-etcd-lock.conf
contents: |
[Service]
Environment="REBOOT_STRATEGY=etcd-lock"
Environment="LOCKSMITHD_ENDPOINT=http://${k8s_etcd_service_ip}:2379"
- name: wait-for-dns.service - name: wait-for-dns.service
enable: true enable: true
contents: | contents: |
@ -104,7 +99,7 @@ storage:
contents: contents:
inline: | inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube 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 - path: /etc/sysctl.d/max-user-watches.conf
filesystem: root filesystem: root
contents: contents:
@ -121,7 +116,7 @@ storage:
--trust-keys-from-https \ --trust-keys-from-https \
--volume config,kind=host,source=/etc/kubernetes \ --volume config,kind=host,source=/etc/kubernetes \
--mount volume=config,target=/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 \ --net=host \
--dns=host \ --dns=host \
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)

View File

@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=3720aff28a465987e079dcd74fe3b6d5046d7010" source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=v0.4.5"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${var.k8s_domain_name}"] api_servers = ["${var.k8s_domain_name}"]