From 777a6bb69701cf41f958f5081f9c68c90b242f73 Mon Sep 17 00:00:00 2001 From: Alan Bridgeman Date: Thu, 15 May 2025 01:18:14 -0500 Subject: [PATCH] Small stuff mostly I think... --- .github/workflows/deploy.yml | 4 ++-- templates/deployment.yaml | 2 ++ values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a9ce163..04a4880 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -332,7 +332,7 @@ jobs: # Verify that the site starts up after the restore - name: Verify Restore run: | - SITE_REQUEST_STATUS_CODE=$(curl -sSL https://$SITE_HOSTNAME -w '%{http_code}' -o /dev/null) + SITE_REQUEST_STATUS_CODE=$(curl -sSL https://${{ env.SITE_HOSTNAME }} -w '%{http_code}' -o /dev/null) MAX_RETRIES=5 RETRY_INTERVAL=30 @@ -344,7 +344,7 @@ jobs: sleep $RETRY_INTERVAL # Get the current status of the site - SITE_REQUEST_STATUS_CODE=$(curl -sSL http://account.bridgemanaccessible.ca -w '%{http_code}' -o /dev/null) + SITE_REQUEST_STATUS_CODE=$(curl -sSL http://${{ env.SITE_HOSTNAME }} -w '%{http_code}' -o /dev/null) # Increment the retry count RETRY_COUNT=$((RETRY_COUNT + 1)) diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 388836f..5ec4e94 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -388,6 +388,8 @@ spec: secretKeyRef: name: {{ .Release.Name }}-cache-credentials key: password + - name: INITIAL_USER_ID + value: {{ .Values.initialUserID | quote }} {{- if .Values.vault.create.snapshotServer.enabled }} volumeMounts: # Mount for a shared volume for Vault credentials diff --git a/values.yaml b/values.yaml index 8a03758..6a95525 100644 --- a/values.yaml +++ b/values.yaml @@ -26,6 +26,10 @@ container: # The timestamp of the backup that the entrypoint script should wait for a restore to complete restoreFromBackup: "" +# The ID of the first/initial user +# This is because AT LEAST one user must be setup to setup everything else +initialUserID: + ingress: # We want an ingress resource if we are deploying to a cluster that has a ingress controller/load balancer # This includes most public cloud providers like EKS, GKE, and AKS