chore: rename secrets ref in appset to deploy

The ref name secrets wasn't good because a lot of times this is where we are getting a helm values file from so rename it to 'deploy' to be more clear.
rackerlabs · Oct 16, 2024 · 050b61c · 050b61c
1 parent 50633cb
commit 050b61c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/apps/appsets/components.yaml b/apps/appsets/components.yaml
@@ -41,7 +41,7 @@ spec:
                                 value: 'understack-cluster-issuer'
                     - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
                       targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
-                      ref: secrets
+                      ref: deploy
                       path: '{{.name}}/secrets/dex'
                     - repoURL: https://charts.dexidp.io
                       chart: dex
@@ -55,7 +55,7 @@ spec:
                             DNS_ZONE: '{{index .metadata.annotations "dns_zone" }}'
                         valueFiles:
                           - $understack/components/dex/values.yaml
-                          - $secrets/{{.name}}/helm-configs/dex.yaml
+                          - $deploy/{{.name}}/helm-configs/dex.yaml
                         ignoreMissingValueFiles: true
                 - component: openstack
                   skipComponent: '{{has "openstack" ((default "[]" (index .metadata.annotations "uc_skip_components") | fromJson))}}'
@@ -84,7 +84,7 @@ spec:
                       ref: understack
                     - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
                       targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
-                      ref: secrets
+                      ref: deploy
                       path: '{{.name}}/secrets/nautobot'
                     - repoURL: https://nautobot.github.io/helm-charts/
                       chart: nautobot
@@ -99,7 +99,7 @@ spec:
                             hostname: 'nautobot.{{index .metadata.annotations "dns_zone" }}'
                         valueFiles:
                           - $understack/components/nautobot/nautobot-values.yaml
-                          - $secrets/{{.name}}/helm-configs/nautobot.yaml
+                          - $deploy/{{.name}}/helm-configs/nautobot.yaml
                         ignoreMissingValueFiles: true
                         fileParameters:
                           - name: nautobot.config
@@ -169,7 +169,6 @@ spec:
                       path: 'components/argo-events'
                     - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
                       targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
-                      ref: secrets
                       path: '{{.name}}/secrets/argo-events'
                 - component: understack-workflows
                   componentNamespace: argo-events
@@ -197,14 +196,14 @@ spec:
                       ref: understack
                     - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
                       targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
-                      ref: secrets
+                      ref: deploy
                     - repoURL: registry.scs.community/openstack-exporter
                       chart: prometheus-openstack-exporter
                       targetRevision: 0.4.5
                       helm:
                         releaseName: prometheus-openstack-exporter
                         valueFiles:
-                          - $secrets/{{.name}}/helm-configs/openstack-exporter.yaml
+                          - $deploy/{{.name}}/helm-configs/openstack-exporter.yaml
                         ignoreMissingValueFiles: true
             selector:
               # by setting the key in the elements 'skipComponent' to 'true' it will skip installing it

diff --git a/apps/appsets/infra.yaml b/apps/appsets/infra.yaml
@@ -55,14 +55,14 @@ spec:
                   sources:
                     - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
                       targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
-                      ref: secrets
+                      ref: deploy
                     - repoURL: https://kubernetes.github.io/ingress-nginx
                       chart: ingress-nginx
                       targetRevision: 4.9.1
                       helm:
                         releaseName: ingress-nginx
                         valueFiles:
-                          - $secrets/{{.name}}/helm-configs/ingress-nginx.yaml
+                          - $deploy/{{.name}}/helm-configs/ingress-nginx.yaml
                         ignoreMissingValueFiles: true
                     - repoURL: https://kubernetes.github.io/ingress-nginx
                       chart: ingress-nginx
@@ -79,7 +79,7 @@ spec:
                               default: false
                               controllerValue: "k8s.io/provisioning-ingress-nginx"  # default: k8s.io/ingress-nginx
                         valueFiles:
-                          - $secrets/{{.name}}/helm-configs/provisioning-ingress-nginx.yaml
+                          - $deploy/{{.name}}/helm-configs/provisioning-ingress-nginx.yaml
                         ignoreMissingValueFiles: true
                 - component: cilium
                   skipComponent: '{{has "cilium" ((default "[]" (index .metadata.annotations "uc_skip_components") | fromJson))}}'

diff --git a/apps/appsets/openstack.yaml b/apps/appsets/openstack.yaml
@@ -45,7 +45,7 @@ spec:
         - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
           targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
           path: '{{.name}}/secrets/{{.component}}'
-          ref: secrets
+          ref: deploy
         - repoURL: https://tarballs.opendev.org/openstack/openstack-helm/
           chart: '{{.component}}'
           targetRevision: '{{.chartVersion}}'
@@ -54,8 +54,8 @@ spec:
             valueFiles:
               - $understack/components/openstack-2024.1-jammy.yaml
               - $understack/components/{{.component}}/aio-values.yaml
-              - $secrets/{{.name}}/secrets/secret-openstack.yaml
-              - $secrets/{{.name}}/helm-configs/{{.component}}.yaml
+              - $deploy/{{.name}}/secrets/secret-openstack.yaml
+              - $deploy/{{.name}}/helm-configs/{{.component}}.yaml
             # don't require all the values files
             ignoreMissingValueFiles: true
       ignoreDifferences:

diff --git a/docs/deploy-guide/auth.md b/docs/deploy-guide/auth.md
@@ -53,9 +53,9 @@ spec:
       helm:
         # context omitted
         valuesFiles:
-            - $values/components/dexidp/values-generic.yaml
-            - $values/components/dexidp/values-azure.yaml
-            - $secrets/YOUR_CLUSTER/helm-configs/dexidp.yaml
+            - $understack/components/dexidp/values-generic.yaml
+            - $understack/components/dexidp/values-azure.yaml
+            - $deploy/YOUR_CLUSTER/helm-configs/dexidp.yaml
 # rest omitted
 ```