Merge pull request #240 from ministryofjustice/waf-variable-work

Added new config value for deployments
ministryofjustice · Dec 3, 2024 · fbadf08 · fbadf08
2 parents 748987c + 3b43083
commit fbadf08
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -50,6 +50,7 @@ jobs:
         alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
         avature-feed-username: ${{ secrets.AVATURE_FEED_USERNAME }}
         avature-feed-password: ${{ secrets.AVATURE_FEED_PASSWORD }}
+        wb-config: ${{ secrets.WB_CONFIG}}
 
   deployDemo:
       name: Deploy to Demo Environment
@@ -92,6 +93,7 @@ jobs:
         alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
         avature-feed-username: ${{ secrets.AVATURE_FEED_USERNAME }}
         avature-feed-password: ${{ secrets.AVATURE_FEED_PASSWORD }}
+        wb-config: ${{ secrets.WB_CONFIG}}
 
   deployStaging:
       name: Deploy to Staging Environment
@@ -134,6 +136,7 @@ jobs:
         alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
         avature-feed-username: ${{ secrets.AVATURE_FEED_USERNAME }}
         avature-feed-password: ${{ secrets.AVATURE_FEED_PASSWORD }}
+        wb-config: ${{ secrets.WB_CONFIG}}
 
   deployProd:
       name: Deploy to Production Environment
@@ -177,3 +180,4 @@ jobs:
         alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
         avature-feed-username: ${{ secrets.AVATURE_FEED_USERNAME }}
         avature-feed-password: ${{ secrets.AVATURE_FEED_PASSWORD }}
+        wb-config: ${{ secrets.WB_CONFIG}}
diff --git a/.github/workflows/rw-build-image.yaml b/.github/workflows/rw-build-image.yaml
@@ -75,6 +75,8 @@ on:
         required: true
       avature-feed-password:
         required: true
+      wb-config:
+        required: true
 
 jobs:
   buildImage:
@@ -223,6 +225,7 @@ jobs:
           --set secrets.s3uploadsregion=${{ secrets.s3-uploads-region }} \
           --set secrets.feedparser.avatureFeedUserName=${{ secrets.avature-feed-username }} \
           --set secrets.feedparser.avatureFeedPassword=${{ secrets.avature-feed-password }} \
+          --set secrets.wbconfig=${{ secrets.wb-config}} \
           --set alertSecrets.slackWebhookUrl=${{ secrets.alert-slack-webhook-url }} \
           --set configmap.envtype=${{ vars.ENV_TYPE }} \
           --set configmap.sentrydns=${{ vars.PHP_DSN }} \

diff --git a/helm_deploy/wordpress/templates/secrets.yaml b/helm_deploy/wordpress/templates/secrets.yaml
@@ -22,6 +22,7 @@ stringData:
   WORDPRESS_SECURE_AUTH_SALT: {{ .Values.secrets.wpsecureauthsalt | b64dec | quote }}
   S3_UPLOADS_BUCKET:  {{ .Values.secrets.s3uploadsbucket }}
   S3_UPLOADS_REGION: {{ .Values.secrets.s3uploadsregion }}
+  WB_CONFIG: {{ .Values.secrets.wbconfig }}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/helm_deploy/wordpress/values.yaml b/helm_deploy/wordpress/values.yaml
@@ -164,6 +164,7 @@ secrets:
   wpsecureauthsalt: ""
   s3uploadsbucket: ""
   s3uploadsregion: ""
+  wbconfig: ""
   feedparser:
     avatureFeedUserName: ""
     avatureFeedUserPassword: ""