From 26cf5a0fc675f92d1af0cd2477ad2df09030f24a Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Thu, 31 Jan 2019 13:00:47 -0600
Subject: [PATCH] Uplift armada, tiller, kubernetes, etcd, coredns

This change updates the following components:

Kubernetes 1.10.11 -> 1.11.6
CoreDNS 1.1.2 -> 1.1.3 (per k8s 1.11 recommendations)
Etcd 3.2.14 -> 3.2.18 (per k8s 1.11 recommendations)
Tiller 2.10.0 -> 2.12.1 (adds support for k8s 1.11, thread safety fix)
Armada as of 2019-02-4 (adds support for Tiller 2.12.1)

Also fixes tiller upgradability.

Change-Id: I2375b0ae167593815c56470ba6a6c7b529375302
---
 global/software/charts/ucp/armada/tiller.yaml |  5 +++
 global/software/config/versions.yaml          | 36 +++++++++----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/global/software/charts/ucp/armada/tiller.yaml b/global/software/charts/ucp/armada/tiller.yaml
index cf02539b3..986609517 100644
--- a/global/software/charts/ucp/armada/tiller.yaml
+++ b/global/software/charts/ucp/armada/tiller.yaml
@@ -34,6 +34,11 @@ data:
     timeout: 100
     labels:
       release_group: airship-ucp-tiller
+    native:
+      # Allows tiller to update its own release's status to DEPLOYED before it
+      # goes away during an upgrade, otherwise it can get stuck in
+      # PENDING_UPGRADE status.
+      enabled: false
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 626a2b44a..555dd7520 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -248,7 +248,7 @@ data:
     ucp:
       armada:
         location: https://git.openstack.org/openstack/airship-armada
-        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
+        reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
         subpath: charts/armada
         type: git
       armada-htk:
@@ -448,7 +448,7 @@ data:
         type: git
       tiller:
         location: https://git.openstack.org/openstack/airship-armada
-        reference: 091dbd283dbd6e7d547af5f2a81a555c39d89167
+        reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
         subpath: charts/tiller
         type: git
       tiller-htk:
@@ -457,7 +457,7 @@ data:
         subpath: helm-toolkit
         type: git
   files:
-    kubelet: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
+    kubelet: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
   images:
     calico:
       calico: {}
@@ -475,27 +475,27 @@ data:
       tenant-ceph-rgw: {}
     kubernetes:
       apiserver:
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
-        apiserver: gcr.io/google-containers/hyperkube-amd64:v1.10.11
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
+        apiserver: gcr.io/google-containers/hyperkube-amd64:v1.11.6
       controller-manager:
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
-        controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.10.11
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
+        controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.11.6
       coredns:
-        coredns: docker.io/coredns/coredns:1.1.2
+        coredns: docker.io/coredns/coredns:1.1.3
       etcd:
-        etcd: quay.io/coreos/etcd:v3.2.14
-        etcdctl: quay.io/coreos/etcd:v3.2.14
+        etcd: quay.io/coreos/etcd:v3.2.18
+        etcdctl: quay.io/coreos/etcd:v3.2.18
       haproxy:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
         haproxy: docker.io/haproxy:1.8.3
       ingress: {}
-      kubectl: gcr.io/google-containers/hyperkube-amd64:v1.10.11
+      kubectl: gcr.io/google-containers/hyperkube-amd64:v1.11.6
       pause: gcr.io/google-containers/pause-amd64:3.1
       proxy:
-        proxy: gcr.io/google-containers/hyperkube-amd64:v1.10.11
+        proxy: gcr.io/google-containers/hyperkube-amd64:v1.11.6
       scheduler:
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
-        scheduler: gcr.io/google-containers/hyperkube-amd64:v1.10.11
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
+        scheduler: gcr.io/google-containers/hyperkube-amd64:v1.11.6
     osh:
       barbican: {}
       cinder: {}
@@ -525,9 +525,9 @@ data:
       prometheus_process_exporter: {}
     ucp:
       armada:
-        api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
-        helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
-        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
+        api: quay.io/airshipit/armada:03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
+        helm: docker.io/lachlanevenson/k8s-helm:v2.12.1
+        tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
       barbican: {}
       deckhand:
         db_sync: quay.io/airshipit/deckhand:0aae9dc1776bd97ab8f4152a51baedb24eb61396