Merge branch 'main' into 90-switch-to-secret-template

defenseunicorns · Apr 19, 2024 · 918282f · 918282f
2 parents 726ed9a + b0e151e
commit 918282f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -14,8 +14,8 @@ components:
         localPath: ../chart
       - name: gitlab
         namespace: gitlab
-        url: https://repo1.dso.mil/big-bang/product/packages/gitlab.git
+        url: https://charts.gitlab.io/
         gitPath: chart
-        version: "7.10.2-bb.0"
+        version: "7.10.2"
         valuesFiles:
           - ../values/common-values.yaml
diff --git a/values/common-values.yaml b/values/common-values.yaml
@@ -2,6 +2,12 @@ global:
   image:
     pullPolicy: IfNotPresent
 
+  ingress:
+    configureCertmanager: false
+
+  kas:
+    enabled: false
+
   hosts:
     domain: ###ZARF_VAR_DOMAIN###
     gitlab:
@@ -86,6 +92,14 @@ global:
     objectStore:
       bucket: ###ZARF_VAR_BUCKET_PREFIX###gitlab-pages###ZARF_VAR_BUCKET_SUFFIX###
 
+  ## https://docs.gitlab.com/charts/charts/globals#service-accounts
+  serviceAccount:
+    enabled: true
+    create: true
+    annotations: {}
+    ## Name to be used for serviceAccount, otherwise defaults to chart fullname
+    # name:
+
 postgresql:
   install: false
 redis:
@@ -97,6 +111,7 @@ registry:
     secret: gitlab-object-store
     key: registry
   metrics:
+    enabled: true
     serviceMonitor: # TODO configure for Prometheus
       enabled: true
 
@@ -125,5 +140,20 @@ gitlab:
       port: 8083
       serviceMonitor:
         enabled: true
+    workhorse:
+      metrics:
+        enabled: true
+
+certmanager:
+  install: false
+
+gitlab-runner:
+  install: false
+
+prometheus:
+  install: false
+
+nginx-ingress: &nginx-ingress
+  enabled: false
 
 domain: ###ZARF_VAR_DOMAIN###
diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
@@ -62,6 +62,7 @@ shared-secrets:
   selfsign:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign
+      tag: 1.6.1
 
 upgradeCheck:
   image: