chore(charts): make use of additionalManifests

This removes the need for copying the test files in the pipeline too
nrwl · Mar 1, 2024 · d40c6ea · d40c6ea
1 parent 7d91c62
commit d40c6ea
Show file tree

Hide file tree

Showing 13 changed files with 180 additions and 30 deletions.
diff --git a/.github/workflows/chart_lint_and_test.yaml b/.github/workflows/chart_lint_and_test.yaml
@@ -40,12 +40,6 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         uses: helm/[email protected]
 
-      - name: Copy template secret
-        if: steps.list-changed.outputs.changed == 'true'
-        run: |
-          cp testing-files/secret.yml charts/nx-cloud/templates/secret.yaml
-          cp testing-files/secret.yml charts/nx-agents/templates/secret.yaml
-
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
         run: ct install --config testing-files/ct.yaml --target-branch ${{ github.event.repository.default_branch }}
diff --git a/charts/nx-agents/Chart.yaml b/charts/nx-agents/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-agents
 description: Nx Cloud Agents Helm Chart
 type: application
-version: 1.0.0
+version: 1.0.1
 maintainers:
   - name: nx
     url: "https://nx.app/"

diff --git a/charts/nx-agents/ci/basic-moreenv.yaml b/charts/nx-agents/ci/basic-moreenv.yaml
@@ -66,3 +66,15 @@ secret:
   name: 'cloudsecret'
   awsS3AccessKeyId: 'AWS_KEY'
   awsS3SecretAccessKey: 'AWS_SECRET'
+
+additionalManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+      namespace: nx-cloud-workflows
+    type: Opaque
+    stringData:
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-agents/ci/basic-values.yaml b/charts/nx-agents/ci/basic-values.yaml
@@ -57,3 +57,15 @@ secret:
   name: 'cloudsecret'
   awsS3AccessKeyId: 'AWS_KEY'
   awsS3SecretAccessKey: 'AWS_SECRET'
+
+additionalManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+      namespace: nx-cloud-workflows
+    type: Opaque
+    stringData:
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-agents/templates/additional-manifests.yaml b/charts/nx-agents/templates/additional-manifests.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraManifests }}
+---
+{{ tpl (toYaml .) $ }}
+{{- end }}
diff --git a/charts/nx-agents/values.yaml b/charts/nx-agents/values.yaml
@@ -121,3 +121,10 @@ secret:
   name: ''
   awsS3AccessKeyId: ''
   awsS3SecretAccessKey: ''
+
+
+# If you would like to manage additional resources with this helm chart you can add additional manifests here.
+# Basic structure is:
+# name: <manifest>
+# name will be ignored when rendering out the manifest. See the testing files for this chart for an example
+extraManifests: {}
diff --git a/charts/nx-cloud/ci/basic-values.yaml b/charts/nx-cloud/ci/basic-values.yaml
@@ -60,3 +60,27 @@ aggregator:
     requests:
       memory: '0.5Mi'
       cpu: '0.1'
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-cloud/ci/scm-gh-values.yaml b/charts/nx-cloud/ci/scm-gh-values.yaml
@@ -44,3 +44,27 @@ aggregator:
     requests:
       memory: '0.5Mi'
       cpu: '0.1'
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-cloud/ci/scm-gl-values.yaml b/charts/nx-cloud/ci/scm-gl-values.yaml
@@ -38,3 +38,27 @@ aggregator:
     requests:
       memory: '0.5Mi'
       cpu: '0.1'
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-cloud/ci/sh-like-values.yaml b/charts/nx-cloud/ci/sh-like-values.yaml
@@ -65,3 +65,27 @@ aggregator:
     requests:
       memory: '0.5Mi'
       cpu: '0.1'
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-cloud/ci/wfcontroller-values-nons.yaml b/charts/nx-cloud/ci/wfcontroller-values-nons.yaml
@@ -41,3 +41,27 @@ nxCloudWorkflows:
     enabled: true
     name: 'nx-cloud-workflow-controller-service'
     externalName: '192.168.1.2'
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/charts/nx-cloud/ci/wfcontroller-values-wns.yaml b/charts/nx-cloud/ci/wfcontroller-values-wns.yaml
@@ -41,3 +41,27 @@ nxCloudWorkflows:
     enabled: true
     name: 'nx-cloud-workflow-controller-service'
     externalName: ''
+
+extraManifests:
+  secret:
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: cloudsecret
+    type: Opaque
+    stringData:
+      NX_CLOUD_MONGO_SERVER_ENDPOINT: "mongodb://127.0.0.1"
+      ADMIN_PASSWORD: "SOME_ADMIN_PASSWORD"
+      GITHUB_SECRET: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_ID: "I_AM_A_SECRET_VALUE"
+      GH_CLIENT_SECRET_VALUE: "I_AM_A_SECRET_VALUE"
+      SOME_SECRET_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITLAB_ACCESS_TOKEN: "I_AM_A_SECRET_VALUE"
+      GITHUB_AUTH_CLIENT_ID: "A_GITHUB_ID"
+      GITHUB_AUTH_CLIENT_SECRET: "A_GITHUB_CLIENT_SECRET"
+      GITHUB_WEBHOOK_SECRET: "A_GITHUB_SECRET_VALUE"
+      GITHUB_AUTH_TOKEN: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_PRIVATE_KEY: "A_GITHUB_SECRET_VALUE"
+      GITHUB_APP_ID: "A_GITHUB_SECRET_VALUE"
+      AWS_KEY: "MYAWSKEY"
+      AWS_SECRET: "SUPER_SECRET_AWS_SECRET"
diff --git a/testing-files/secret.yml b/testing-files/secret.yml