From c1d20b31af24850d67b3977c4efd741b83faad4a Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Fri, 28 Oct 2022 12:52:56 +0200
Subject: [PATCH] [GitHub Actions] Update secrets management

---
 scripts/delete-secret.sh     | 14 ++++++++++++++
 scripts/deploy-gh-runners.sh | 19 +++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100755 scripts/delete-secret.sh

diff --git a/scripts/delete-secret.sh b/scripts/delete-secret.sh
new file mode 100755
index 00000000..7105b7fa
--- /dev/null
+++ b/scripts/delete-secret.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+NS=default
+if [ "$1" == "" ]; then
+  echo "Arguments: <secret-name> [namespace]"
+  exit 1
+fi
+SECRET=$1
+if [ "$2" != "" ]; then
+  NS=$2
+fi
+COUNT=$(kubectl get secrets --namespace $NS | grep -c -F "$SECRET")
+if ((COUNT > 0)); then
+  kubectl delete secret $SECRET --namespace $NS
+fi
diff --git a/scripts/deploy-gh-runners.sh b/scripts/deploy-gh-runners.sh
index 15748580..931ab33a 100755
--- a/scripts/deploy-gh-runners.sh
+++ b/scripts/deploy-gh-runners.sh
@@ -44,10 +44,8 @@ export SVC=controller-manager
 $SCDIR/ensure-ns.sh $NS
 kubectl apply -f $SCDIR/k8s/pod-priorities.yaml
 kubectl apply -f $SCDIR/k8s/pod-priorities.yaml --namespace $NS
-COUNT=$(kubectl get secrets --namespace $NS | grep -c -F "$SVC")
-if ((COUNT > 0)); then
-  kubectl delete secret "$SVC" --namespace $NS
-fi
+echo "Create secret $SVC in $NS"
+$SCDIR/delete-secret.sh $SVC $NS
 if [ "$GH_ARC_PAT" != "" ]; then
   echo "Using GH_ARC_PAT as github_token"
   kubectl create secret generic "$SVC" \
@@ -61,22 +59,19 @@ else
     --from-literal=github_app_installation_id="${GH_ARC_INSTALLATION_ID}" \
     --from-literal=github_app_private_key="${GH_ARC_PRIVATE_KEY}"
 fi
-COUNT=$(kubectl get secrets --namespace $NS | grep -c -F "scdf-metadata-default")
-if ((COUNT > 0)); then
-  kubectl delete secret scdf-metadata-default --namespace $NS
-fi
+echo "Create secret scdf-metadata-default in $NS"
+$SCDIR/delete-secret.sh scdf-metadata-default $NS
 kubectl create secret docker-registry scdf-metadata-default --namespace $NS \
   --docker-server=registry-1.docker.io \
   --docker-username=$DOCKER_HUB_USERNAME \
   --docker-password=$DOCKER_HUB_PASSWORD
-COUNT=$(kubectl get secrets --namespace default | grep -c -F "scdf-metadata-default")
-if ((COUNT > 0)); then
-  kubectl delete secret scdf-metadata-default --namespace default
-fi
+echo "Create secret scdf-metadata-default in default"
+$SCDIR/delete-secret.sh scdf-metadata-default default
 kubectl create secret docker-registry scdf-metadata-default --namespace default \
   --docker-server=registry-1.docker.io \
   --docker-username=$DOCKER_HUB_USERNAME \
   --docker-password=$DOCKER_HUB_PASSWORD
+
 if [ "$DEPLOY_TYPE" == "helm" ]; then
   HELM_VER=$($SCDIR/determine-default.sh stream-apps-gh-runners "helm_version")
   if [ "$HELM_VER" == "" ] || [ "$HELM_VER" == "null" ]; then