update settings chart to have its own flavored values for kubectl image

defenseunicorns · Dec 11, 2024 · 90369f2 · 90369f2
1 parent 4ea90c1
commit 90369f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/values/settings-registry1-values.yaml b/values/settings-registry1-values.yaml
@@ -0,0 +1,5 @@
+global:
+  kubectl:
+    image:
+      repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
+      tag: 17.6.1
diff --git a/values/settings-unicorn-values.yaml b/values/settings-unicorn-values.yaml
@@ -0,0 +1,5 @@
+global:
+  kubectl:
+    image:
+      repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
+      tag: v17.6.1
diff --git a/values/settings-upstream-values.yaml b/values/settings-upstream-values.yaml
@@ -0,0 +1,5 @@
+global:
+  kubectl:
+    image:
+      repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
+      tag: v17.6.1
diff --git a/zarf.yaml b/zarf.yaml
@@ -53,7 +53,7 @@ components:
           - values/registry1-values.yaml
       - name: uds-gitlab-settings
         valuesFiles:
-          - values/registry1-values.yaml
+          - values/settings-registry1-values.yaml
     images:
       - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.6.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign:1.6.1"
@@ -83,7 +83,7 @@ components:
           - values/upstream-values.yaml
       - name: uds-gitlab-settings
         valuesFiles:
-          - values/upstream-values.yaml
+          - values/settings-upstream-values.yaml
     images:
       - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.6.1"
       - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.6.1"
@@ -114,7 +114,7 @@ components:
           - values/unicorn-values.yaml
       - name: uds-gitlab-settings
         valuesFiles:
-          - values/unicorn-values.yaml
+          - values/settings-unicorn-values.yaml
     images:
       - "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.6.1"
       - "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.6.1"