From 08f5ca39b00fb6b1692fb6fdead7d674b7ea375b Mon Sep 17 00:00:00 2001
From: Tim Jacomb <tim.jacomb@hmcts.net>
Date: Thu, 19 Aug 2021 11:52:49 +0100
Subject: [PATCH] Avoid substitution issue in kustomize credentials sync

Signed-off-by: Tim Jacomb <tim.jacomb@hmcts.net>
---
 .../eventhub-credentials-sync/_base/sync.yaml    | 14 +++++++-------
 .../_cronjobs/_base/sync.yaml                    |  6 +++---
 .../registry-credentials-sync/_base/sync.yaml    | 16 ++++++++--------
 .../_cronjobs/_base/sync.yaml                    |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml b/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
index 80d89a0d..9e8ab4f5 100644
--- a/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
+++ b/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
@@ -50,16 +50,16 @@ spec:
               $(RECONCILE_SH)
 
               apply-secret() {
-                /kbin/kubectl create secret generic "${1}" \
-                  --from-literal=token="${2}" \
-                  --from-literal=address="${3}" \
+                /kbin/kubectl create secret generic "$1" \
+                  --from-literal=token="$2" \
+                  --from-literal=address="$3" \
                   --dry-run=client -o=yaml \
                   | grep -v "creationTimestamp:" \
                   | /kbin/kubectl apply -f -
               }
 
               pause_loop() {
-                sleep "${SYNC_PERIOD:-3600}" || true
+                sleep "$SYNC_PERIOD" || true
               }
 
               graceful_exit() {
@@ -71,8 +71,8 @@ spec:
                     | tr [ %
                   )"
                 # shellcheck disable=SC2086
-                if [ "${job_ids}" ]; then
-                  kill ${job_ids}
+                if [ "$job_ids" ]; then
+                  kill $job_ids
                 fi
                 wait
                 echo "Graceful exit -- $(date)"
@@ -80,7 +80,7 @@ spec:
 
               trap graceful_exit INT TERM
 
-              echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)"
+              echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
               while true; do
                 reconcile & wait $!
                 pause_loop & wait $!
diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
index 56d47856..f2525d96 100644
--- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
+++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
@@ -52,9 +52,9 @@ spec:
                   $(RECONCILE_SH)
 
                   apply-secret() {
-                    /kbin/kubectl create secret generic "${1}" \
-                      --from-literal=token="${2}" \
-                      --from-literal=address="${3}" \
+                    /kbin/kubectl create secret generic "$1" \
+                      --from-literal=token="$2" \
+                      --from-literal=address="$3" \
                       --dry-run=client -o=yaml \
                       | grep -v "creationTimestamp:" \
                       | /kbin/kubectl apply -f -
diff --git a/manifests/integrations/registry-credentials-sync/_base/sync.yaml b/manifests/integrations/registry-credentials-sync/_base/sync.yaml
index f827c2aa..913b94e2 100644
--- a/manifests/integrations/registry-credentials-sync/_base/sync.yaml
+++ b/manifests/integrations/registry-credentials-sync/_base/sync.yaml
@@ -46,17 +46,17 @@ spec:
           $(RECONCILE_SH)
 
           apply-secret() {
-            /kbin/kubectl create secret docker-registry "${1}" \
-              --docker-password="${2}" \
-              --docker-username="${3}" \
-              --docker-server="${4}" \
+            /kbin/kubectl create secret docker-registry "$1" \
+              --docker-password="$2" \
+              --docker-username="$3" \
+              --docker-server="$4" \
               --dry-run=client -o=yaml \
               | grep -v "creationTimestamp:" \
               | /kbin/kubectl apply -f -
           }
 
           pause_loop() {
-            sleep "${SYNC_PERIOD:-3600}" || true
+            sleep "$SYNC_PERIOD" || true
           }
 
           graceful_exit() {
@@ -68,8 +68,8 @@ spec:
                 | tr [ %
               )"
             # shellcheck disable=SC2086
-            if [ "${job_ids}" ]; then
-              kill ${job_ids}
+            if [ "$job_ids" ]; then
+              kill $job_ids
             fi
             wait
             echo "Graceful exit -- $(date)"
@@ -77,7 +77,7 @@ spec:
 
           trap graceful_exit INT TERM
 
-          echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)"
+          echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
           while true; do
             reconcile & wait $!
             pause_loop & wait $!
diff --git a/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml b/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
index 2fcc3a2a..fc00a3c6 100644
--- a/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
+++ b/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
@@ -48,10 +48,10 @@ spec:
               $(RECONCILE_SH)
 
               apply-secret() {
-                /kbin/kubectl create secret docker-registry "${1}" \
-                  --docker-password="${2}" \
-                  --docker-username="${3}" \
-                  --docker-server="${4}" \
+                /kbin/kubectl create secret docker-registry "$1" \
+                  --docker-password="$2" \
+                  --docker-username="$3" \
+                  --docker-server="$4" \
                   --dry-run=client -o=yaml \
                   | grep -v "creationTimestamp:" \
                   | /kbin/kubectl apply -f -