From bc24599267df48d62df0887b0935b27a3fcc44a9 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Tue, 1 Feb 2022 18:10:02 -0800
Subject: [PATCH] Use same helm wrapper script for all nodes

The helm wrapper script should be the same for genesis and non-genesis
nodes. The one previously used by join nodes is removed.

Change-Id: I212127f258b9eba4fce776cb690060dc413061ca
---
 .../{genesis => common}/usr/local/bin/helm    |  0
 .../templates/roles/join/usr/local/bin/helm   | 20 -------------------
 2 files changed, 20 deletions(-)
 rename promenade/templates/roles/{genesis => common}/usr/local/bin/helm (100%)
 delete mode 100755 promenade/templates/roles/join/usr/local/bin/helm

diff --git a/promenade/templates/roles/genesis/usr/local/bin/helm b/promenade/templates/roles/common/usr/local/bin/helm
similarity index 100%
rename from promenade/templates/roles/genesis/usr/local/bin/helm
rename to promenade/templates/roles/common/usr/local/bin/helm
diff --git a/promenade/templates/roles/join/usr/local/bin/helm b/promenade/templates/roles/join/usr/local/bin/helm
deleted file mode 100755
index 7e7b5849..00000000
--- a/promenade/templates/roles/join/usr/local/bin/helm
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "x$(pwd)" = "x/" ]; then
-    UPDIR=/
-    WORKDIR=/
-else
-    UPDIR=$(pwd)/..
-    WORKDIR=/up/$(basename $(pwd))
-fi
-
-exec docker run --rm -it \
-    --net host \
-    -v $UPDIR:/up \
-    -v /etc/kubernetes/admin:/etc/kubernetes/admin \
-    -w $WORKDIR \
-    -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
-    {{ config['HostSystem:images.helm.helm'] }} \
-        $*