From 63b63e30e5742b0753f815a994fa8a60c17e681b Mon Sep 17 00:00:00 2001
From: Samuel Pilla <sp516w@att.com>
Date: Thu, 7 Nov 2019 11:07:37 -0600
Subject: [PATCH] Upgrade Tiller version for k8s 1.16

Upgrade Tiller to v2.16.0

Change-Id: I1d017a90d0a7fb52c543777f56482767df00d832
---
 global/software/config/versions.yaml                          | 2 +-
 tools/deployment/airskiff/developer/000-clone-dependencies.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 4e71e6329..8a50510fc 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -966,7 +966,7 @@ data:
         ks_endpoints: docker.io/openstackhelm/heat:newton
         ks_service: docker.io/openstackhelm/heat:newton
         ks_user: docker.io/openstackhelm/heat:newton
-        tiller: gcr.io/kubernetes-helm/tiller:v2.14.1
+        tiller: gcr.io/kubernetes-helm/tiller:v2.16.0
       barbican:
         bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
diff --git a/tools/deployment/airskiff/developer/000-clone-dependencies.sh b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
index 46d01f0cd..484db8608 100755
--- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
@@ -19,7 +19,7 @@ set -xe
 
 CURRENT_DIR="$(pwd)"
 : "${INSTALL_PATH:="../"}"
-: "${OSH_INFRA_COMMIT:="8ba46703ee9fab0115e4b7f62ea43e0798c36872"}"
+: "${OSH_INFRA_COMMIT:="7fca2677da42d977d7fb5df5e79a67e76354f42a"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"