Helm Migration for Staging (#3186)

* turning on targetgroup bindings and turning on staging for helmfile * adding dummy services back to celery so that our metrics can read them * just makign this consistent for rollout * fixing celery hpa * removing kustomize apply ins staging workflow * turning off kustomize deployments for our helm migrated components on dev, sandbox and staging * fixing xray url * cleaning up env vars thing * removing syntax check since helmfile auto does it * switch to helmfile sync * xray url fix again --------- Co-authored-by: Ben Larabie <[email protected]>
cds-snc · Dec 12, 2024 · 43ad36e · 43ad36e
1 parent b5cf7b9
commit 43ad36e
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 218 deletions.
diff --git a/.github/workflows/helmfile_production_apply.yaml b/.github/workflows/helmfile_production_apply.yaml
@@ -84,7 +84,7 @@ jobs:
         id: helmfile_apply
         run: |
           pushd helmfile
-          helmfile --environment production apply
+          helmfile --environment production sync
           popd
 
       - name: Notify Slack channel if this job failed

diff --git a/.github/workflows/helmfile_staging_apply.yaml b/.github/workflows/helmfile_staging_apply.yaml
@@ -82,7 +82,7 @@ jobs:
         id: helmfile_apply
         run: |
           pushd helmfile
-          helmfile --environment staging apply
+          helmfile --environment staging sync
           popd
 
       - name: Notify Slack channel if this job failed

diff --git a/.github/workflows/syntax_check.yaml b/.github/workflows/syntax_check.yaml
diff --git a/.github/workflows/test_env_vars.yaml b/.github/workflows/test_env_vars.yaml
@@ -4,9 +4,13 @@ on:
   pull_request:
     branches:
       - main
+    paths:
+      - "VERSION"      
   push:
     branches:
       - main
+    paths:
+      - "VERSION"
 
 defaults:
   run:
@@ -32,35 +36,13 @@ jobs:
           aws-secret-access-key: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
           aws-region: ca-central-1
 
-      - name: Get staging env var keys
-        run: |
-          make decrypt-staging
-          ENV_KEYS_STAGING="$(make env-keys-staging)"
-          echo "::add-mask::$ENV_KEYS_STAGING"
-          echo "ENV_KEYS_STAGING=$ENV_KEYS_STAGING" >> $GITHUB_ENV
-
-      - name: Configure AWS production credentials
-        uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
-        with:
-          aws-access-key-id: ${{ secrets.PRODUCTION_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.PRODUCTION_AWS_SECRET_ACCESS_KEY }}
-          aws-region: ca-central-1
-
       - name: Get production env var keys
         run: |
           make decrypt-production
           ENV_KEYS_PRODUCTION="$(make env-keys-production)"
           echo "::add-mask::$ENV_KEYS_PRODUCTION"
           echo "ENV_KEYS_PRODUCTION=$ENV_KEYS_PRODUCTION" >> $GITHUB_ENV
 
-      - name: Test example and staging env vars
-        uses: ./.github/actions/diff-env-vars
-        with:
-          env1-name: EXAMPLE
-          env1-vars: ${{ env.ENV_KEYS_EXAMPLE }}
-          env2-name: STAGING
-          env2-vars: ${{ env.ENV_KEYS_STAGING }}
-
       - name: Test example and production env vars
         uses: ./.github/actions/diff-env-vars
         if: always()
@@ -69,12 +51,3 @@ jobs:
           env1-vars: ${{ env.ENV_KEYS_EXAMPLE }}
           env2-name: PRODUCTION
           env2-vars: ${{ env.ENV_KEYS_PRODUCTION }}
-
-      - name: Test staging and production env vars
-        uses: ./.github/actions/diff-env-vars
-        if: always()
-        with:
-          env1-name: STAGING
-          env1-vars: ${{ env.ENV_KEYS_STAGING }}
-          env2-name: PRODUCTION
-          env2-vars: ${{ env.ENV_KEYS_PRODUCTION }}
diff --git a/env/dev/kustomization.yaml b/env/dev/kustomization.yaml
@@ -5,23 +5,23 @@ resources:
   - fluentbit.yaml
   - cwagent.yaml
   - cwagent-configmap.yaml
-  - notification-service-account.yaml
-  - api-target-group.yaml
-  - admin-target-group.yaml
-  - document-download-api-target-group.yaml
-  - documentation-target-group.yaml
+  # - notification-service-account.yaml
+  # - api-target-group.yaml
+  # - admin-target-group.yaml
+  # - document-download-api-target-group.yaml
+  # - documentation-target-group.yaml
   - ../../base/prometheus-cloudwatch
-  - ../../base/notify-admin
-  - ../../base/notify-api
-  - ../../base/notify-celery-other
-  - ../../base/notify-celery-main-primary
-  - ../../base/notify-celery-sms-send-primary
-  - ../../base/notify-celery-email-send-primary
-  - ../../base/notify-celery-main-scalable
-  - ../../base/notify-celery-sms-send-scalable
-  - ../../base/notify-celery-email-send-scalable
-  - ../../base/notify-document-download
-  - ../../base/notify-documentation
+  # - ../../base/notify-admin
+  # - ../../base/notify-api
+  # - ../../base/notify-celery-other
+  # - ../../base/notify-celery-main-primary
+  # - ../../base/notify-celery-sms-send-primary
+  # - ../../base/notify-celery-email-send-primary
+  # - ../../base/notify-celery-main-scalable
+  # - ../../base/notify-celery-sms-send-scalable
+  # - ../../base/notify-celery-email-send-scalable
+  # - ../../base/notify-document-download
+  # - ../../base/notify-documentation
   - ../../base/notify-system
 
 images:
@@ -34,45 +34,45 @@ images:
   - name: documentation
     newName: public.ecr.aws/cds-snc/notify-documentation:latest
 
-patches:
-  - path: performance/admin-hpa-patch.yaml
-  - path: performance/api-hpa-patch.yaml
-  - path: performance/celery-email-send-primary-deployment-patch.yaml
-  - path: performance/celery-email-send-scalable-deployment-patch.yaml
-  - path: performance/celery-email-send-scalable-hpa-patch.yaml
-  - path: performance/celery-primary-deployment-patch.yaml
-  - path: performance/celery-scalable-deployment-patch.yaml
-  - path: performance/celery-scalable-hpa-patch.yaml
-  - path: performance/celery-sms-send-primary-deployment-patch.yaml
-  - path: performance/celery-sms-send-scalable-deployment-patch.yaml
-  - path: performance/celery-sms-send-scalable-hpa-patch.yaml
+# patches:
+#   - path: performance/admin-hpa-patch.yaml
+#   - path: performance/api-hpa-patch.yaml
+#   - path: performance/celery-email-send-primary-deployment-patch.yaml
+#   - path: performance/celery-email-send-scalable-deployment-patch.yaml
+#   - path: performance/celery-email-send-scalable-hpa-patch.yaml
+#   - path: performance/celery-primary-deployment-patch.yaml
+#   - path: performance/celery-scalable-deployment-patch.yaml
+#   - path: performance/celery-scalable-hpa-patch.yaml
+#   - path: performance/celery-sms-send-primary-deployment-patch.yaml
+#   - path: performance/celery-sms-send-scalable-deployment-patch.yaml
+#   - path: performance/celery-sms-send-scalable-hpa-patch.yaml
 
-  - path: services/admin-service-patch.yaml
-  - path: services/api-service-patch.yaml
-  - path: services/document-download-api-service-patch.yaml
-  - path: services/documentation-service-patch.yaml
+#   - path: services/admin-service-patch.yaml
+#   - path: services/api-service-patch.yaml
+#   - path: services/document-download-api-service-patch.yaml
+#   - path: services/documentation-service-patch.yaml
 
   - path: cwagent/cwagent-deployment-patch.yaml
 
-  - path: nodeselectors/admin-node-selector-patch.yaml
-  - path: nodeselectors/celery-api-node-selector-patch.yaml
-  - path: nodeselectors/celery-beat-node-selector-patch.yaml
-  - path: nodeselectors/celery-email-send-node-selector-patch.yaml
-  - path: nodeselectors/celery-email-send-scalable-node-selector-patch.yaml
-  - path: nodeselectors/celery-primary-node-selector-patch.yaml
-  - path: nodeselectors/celery-scalable-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-send-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-send-scalable-node-selector-patch.yaml
-  - path: nodeselectors/document-download-api-node-selector-patch.yaml
-  - path: nodeselectors/documentation-node-selector-patch.yaml
+#   - path: nodeselectors/admin-node-selector-patch.yaml
+#   - path: nodeselectors/celery-api-node-selector-patch.yaml
+#   - path: nodeselectors/celery-beat-node-selector-patch.yaml
+#   - path: nodeselectors/celery-email-send-node-selector-patch.yaml
+#   - path: nodeselectors/celery-email-send-scalable-node-selector-patch.yaml
+#   - path: nodeselectors/celery-primary-node-selector-patch.yaml
+#   - path: nodeselectors/celery-scalable-node-selector-patch.yaml
+#   - path: nodeselectors/celery-sms-node-selector-patch.yaml
+#   - path: nodeselectors/celery-sms-send-node-selector-patch.yaml
+#   - path: nodeselectors/celery-sms-send-scalable-node-selector-patch.yaml
+#   - path: nodeselectors/document-download-api-node-selector-patch.yaml
+#   - path: nodeselectors/documentation-node-selector-patch.yaml
 
-  - path: celery-init-delete/celery-email-send-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-email-send-scalable-init-delete-patch.yaml
-  - path: celery-init-delete/celery-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-scalable-init-delete-patch.yaml
-  - path: celery-init-delete/celery-sms-send-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-sms-send-scalable-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-email-send-primary-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-email-send-scalable-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-primary-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-scalable-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-sms-send-primary-init-delete-patch.yaml
+#   - path: celery-init-delete/celery-sms-send-scalable-init-delete-patch.yaml
 
 configMapGenerator:
   - envs:

diff --git a/env/sandbox/kustomization.yaml b/env/sandbox/kustomization.yaml
@@ -5,24 +5,24 @@ resources:
   - fluentbit.yaml
   - cwagent.yaml
   - cwagent-configmap.yaml
-  - notification-service-account.yaml
-  - api-target-group.yaml
-  - admin-target-group.yaml
-  - document-download-api-target-group.yaml
-  - documentation-target-group.yaml
+  # - notification-service-account.yaml
+  # - api-target-group.yaml
+  # - admin-target-group.yaml
+  # - document-download-api-target-group.yaml
+  # - documentation-target-group.yaml
   - aws-auth-configmap.yaml
   - ../../base/prometheus-cloudwatch
-  - ../../base/notify-admin
-  - ../../base/notify-api
-  - ../../base/notify-celery-other
-  - ../../base/notify-celery-main-primary
-  - ../../base/notify-celery-sms-send-primary
-  - ../../base/notify-celery-email-send-primary
-  - ../../base/notify-celery-main-scalable
-  - ../../base/notify-celery-sms-send-scalable
-  - ../../base/notify-celery-email-send-scalable
-  - ../../base/notify-document-download
-  - ../../base/notify-documentation
+  # - ../../base/notify-admin
+  # - ../../base/notify-api
+  # - ../../base/notify-celery-other
+  # - ../../base/notify-celery-main-primary
+  # - ../../base/notify-celery-sms-send-primary
+  # - ../../base/notify-celery-email-send-primary
+  # - ../../base/notify-celery-main-scalable
+  # - ../../base/notify-celery-sms-send-scalable
+  # - ../../base/notify-celery-email-send-scalable
+  # - ../../base/notify-document-download
+  # - ../../base/notify-documentation
   - ../../base/notify-system
 
 images:
@@ -36,44 +36,44 @@ images:
     newName: public.ecr.aws/cds-snc/notify-documentation:latest
 
 patches:
-  - path: performance/admin-hpa-patch.yaml
-  - path: performance/api-hpa-patch.yaml
-  - path: performance/celery-email-send-primary-deployment-patch.yaml
-  - path: performance/celery-email-send-scalable-deployment-patch.yaml
-  - path: performance/celery-email-send-scalable-hpa-patch.yaml
-  - path: performance/celery-primary-deployment-patch.yaml
-  - path: performance/celery-scalable-deployment-patch.yaml
-  - path: performance/celery-scalable-hpa-patch.yaml
-  - path: performance/celery-sms-send-primary-deployment-patch.yaml
-  - path: performance/celery-sms-send-scalable-deployment-patch.yaml
-  - path: performance/celery-sms-send-scalable-hpa-patch.yaml
+  # - path: performance/admin-hpa-patch.yaml
+  # - path: performance/api-hpa-patch.yaml
+  # - path: performance/celery-email-send-primary-deployment-patch.yaml
+  # - path: performance/celery-email-send-scalable-deployment-patch.yaml
+  # - path: performance/celery-email-send-scalable-hpa-patch.yaml
+  # - path: performance/celery-primary-deployment-patch.yaml
+  # - path: performance/celery-scalable-deployment-patch.yaml
+  # - path: performance/celery-scalable-hpa-patch.yaml
+  # - path: performance/celery-sms-send-primary-deployment-patch.yaml
+  # - path: performance/celery-sms-send-scalable-deployment-patch.yaml
+  # - path: performance/celery-sms-send-scalable-hpa-patch.yaml
 
-  - path: services/admin-service-patch.yaml
-  - path: services/api-service-patch.yaml
-  - path: services/document-download-api-service-patch.yaml
-  - path: services/documentation-service-patch.yaml
+  # - path: services/admin-service-patch.yaml
+  # - path: services/api-service-patch.yaml
+  # - path: services/document-download-api-service-patch.yaml
+  # - path: services/documentation-service-patch.yaml
 
   - path: cwagent/cwagent-deployment-patch.yaml
 
-  - path: nodeselectors/admin-node-selector-patch.yaml
-  - path: nodeselectors/celery-api-node-selector-patch.yaml
-  - path: nodeselectors/celery-beat-node-selector-patch.yaml
-  - path: nodeselectors/celery-email-send-node-selector-patch.yaml
-  - path: nodeselectors/celery-email-send-scalable-node-selector-patch.yaml
-  - path: nodeselectors/celery-primary-node-selector-patch.yaml
-  - path: nodeselectors/celery-scalable-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-send-node-selector-patch.yaml
-  - path: nodeselectors/celery-sms-send-scalable-node-selector-patch.yaml
-  - path: nodeselectors/document-download-api-node-selector-patch.yaml
-  - path: nodeselectors/documentation-node-selector-patch.yaml
+  # - path: nodeselectors/admin-node-selector-patch.yaml
+  # - path: nodeselectors/celery-api-node-selector-patch.yaml
+  # - path: nodeselectors/celery-beat-node-selector-patch.yaml
+  # - path: nodeselectors/celery-email-send-node-selector-patch.yaml
+  # - path: nodeselectors/celery-email-send-scalable-node-selector-patch.yaml
+  # - path: nodeselectors/celery-primary-node-selector-patch.yaml
+  # - path: nodeselectors/celery-scalable-node-selector-patch.yaml
+  # - path: nodeselectors/celery-sms-node-selector-patch.yaml
+  # - path: nodeselectors/celery-sms-send-node-selector-patch.yaml
+  # - path: nodeselectors/celery-sms-send-scalable-node-selector-patch.yaml
+  # - path: nodeselectors/document-download-api-node-selector-patch.yaml
+  # - path: nodeselectors/documentation-node-selector-patch.yaml
 
-  - path: celery-init-delete/celery-email-send-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-email-send-scalable-init-delete-patch.yaml
-  - path: celery-init-delete/celery-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-scalable-init-delete-patch.yaml
-  - path: celery-init-delete/celery-sms-send-primary-init-delete-patch.yaml
-  - path: celery-init-delete/celery-sms-send-scalable-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-email-send-primary-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-email-send-scalable-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-primary-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-scalable-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-sms-send-primary-init-delete-patch.yaml
+  # - path: celery-init-delete/celery-sms-send-scalable-init-delete-patch.yaml
 
 configMapGenerator:
   - envs: