From b70bdd6a713845b370587451d9f7f9356bc4157c Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 31 Aug 2021 21:56:04 +0000
Subject: [PATCH] Get kubeadm working again

This change fixes several issues with kubeadm, notably
the tiller image url/version, as well as fixing the
docker python library missing.

Change-Id: I35528bd45c08ac8580d9875dc54b300a2137fe73
---
 releasenotes/notes/tiller.yaml                          | 1 +
 tiller/Chart.yaml                                       | 4 ++--
 tiller/values.yaml                                      | 2 +-
 tools/images/kubeadm-aio/Dockerfile                     | 1 +
 tools/images/kubeadm-aio/assets/entrypoint.sh           | 2 +-
 tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/releasenotes/notes/tiller.yaml b/releasenotes/notes/tiller.yaml
index 55383c4104..24827f5365 100644
--- a/releasenotes/notes/tiller.yaml
+++ b/releasenotes/notes/tiller.yaml
@@ -2,4 +2,5 @@
 tiller:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
+  - 0.1.2 Update tiller image url and version
 ...
diff --git a/tiller/Chart.yaml b/tiller/Chart.yaml
index 4b845afa58..de7316b772 100644
--- a/tiller/Chart.yaml
+++ b/tiller/Chart.yaml
@@ -12,10 +12,10 @@
 
 ---
 apiVersion: v1
-appVersion: v2.16.9
+appVersion: v2.17.0
 description: OpenStack-Helm Tiller
 name: tiller
-version: 0.1.1
+version: 0.1.2
 home: https://github.com/kubernetes/helm
 sources:
   - https://github.com/kubernetes/helm
diff --git a/tiller/values.yaml b/tiller/values.yaml
index 161e994c56..85f2f4e4c6 100644
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@@ -25,7 +25,7 @@ release_group: null
 
 images:
   tags:
-    tiller: gcr.io/kubernetes-helm/tiller:v2.16.9
+    tiller: ghcr.io/helm/tiller:v2.17.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index 08f11e97e6..5b966f93ee 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -85,6 +85,7 @@ RUN set -ex ;\
     # what's deployed in the gates
     pip3 --no-cache-dir install --upgrade \
       requests \
+      docker \
       kubernetes \
       "ansible==2.5.5" ;\
     for BINARY in kubectl kubeadm; do \
diff --git a/tools/images/kubeadm-aio/assets/entrypoint.sh b/tools/images/kubeadm-aio/assets/entrypoint.sh
index 8bf7918d4b..8a005608f8 100755
--- a/tools/images/kubeadm-aio/assets/entrypoint.sh
+++ b/tools/images/kubeadm-aio/assets/entrypoint.sh
@@ -36,7 +36,7 @@ fi
 : ${NET_SUPPORT_LINUXBRIDGE:="true"}
 : ${PVC_SUPPORT_CEPH:="false"}
 : ${PVC_SUPPORT_NFS:="false"}
-: ${HELM_TILLER_IMAGE:="gcr.io/kubernetes-helm/tiller:${HELM_VERSION}"}
+: ${HELM_TILLER_IMAGE:="ghcr.io/helm/tiller:${HELM_VERSION}"}
 : ${KUBE_VERSION:="${KUBE_VERSION}"}
 : ${KUBE_IMAGE_REPO:="k8s.gcr.io"}
 : ${KUBE_API_BIND_PORT:="6443"}
diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
index fa005c337e..e16f7de4b1 100644
--- a/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
+++ b/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
@@ -34,7 +34,7 @@ all:
       pv_support_nfs: true
       bind_device: null
     helm:
-      tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0
+      tiller_image: ghcr.io/helm/tiller:v2.17.0
     k8s:
       kubernetesVersion: v1.18.9
       imageRepository: k8s.gcr.io