From ddfa5e1bea0bd49a42578b699839980d13696856 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Mon, 26 Jun 2017 22:22:28 -0700
Subject: [PATCH] gce: Update Kubernetes to v1.6.6

* Disable locksmithd.service on hosts, the container linux
update operator will be used instead
---
 .../cl/bootkube-controller.yaml.tmpl                  | 11 +++--------
 gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl      | 11 +++--------
 gce-bootkube/bootkube.tf                              |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl b/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl
index 2fc503c0..5e28c565 100644
--- a/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl
+++ b/gce-bootkube-controller/cl/bootkube-controller.yaml.tmpl
@@ -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 \
diff --git a/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl b/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl
index c0679c01..08ddac93 100644
--- a/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl
+++ b/gce-bootkube-worker/cl/bootkube-worker.yaml.tmpl
@@ -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)
diff --git a/gce-bootkube/bootkube.tf b/gce-bootkube/bootkube.tf
index d2d27ed8..c5fe4c56 100644
--- a/gce-bootkube/bootkube.tf
+++ b/gce-bootkube/bootkube.tf
@@ -1,6 +1,6 @@
 # Self-hosted Kubernetes assets (kubeconfig, manifests)
 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}"
   api_servers                   = ["${var.k8s_domain_name}"]