Merge branch 'main' into add-cgroups-init-image

defenseunicorns · Dec 3, 2024 · 24b3098 · 24b3098
2 parents 222320f + c82a10a
commit 24b3098
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 55 deletions.
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
@@ -12,7 +12,7 @@ metadata:
 packages:
   - name: minio-operator
     repository: ghcr.io/defenseunicorns/packages/uds/minio-operator
-    ref: 6.0.4-uds.0-upstream
+    ref: 6.0.4-uds.2-upstream
     overrides:
       minio-operator:
         uds-minio-config:
@@ -66,7 +66,7 @@ packages:
 
   - name: valkey
     repository: ghcr.io/defenseunicorns/packages/uds/valkey
-    ref: 8.0.1-uds.0-upstream
+    ref: 8.0.1-uds.1-upstream
     overrides:
       valkey:
         uds-valkey-config:

diff --git a/charts/config/templates/gitlab-object-store-secret.yaml b/charts/config/templates/gitlab-object-store-secret.yaml
@@ -38,12 +38,10 @@ stringData:
   registry: |-
     s3:
       bucket: {{ .Values.storage.createSecret.bucketPrefix }}gitlab-registry{{ .Values.storage.createSecret.bucketSuffix }}
-      aws_access_key_id: {{ $awsAccessKey }}
-      aws_secret_access_key: {{ $awsSecretKey }}
+      accesskey: {{ $awsAccessKey }}
+      secretkey: {{ $awsSecretKey }}
       regionendpoint: {{ .Values.storage.endpoint | quote }}
       region: {{ .Values.storage.createSecret.region | quote }}
-      aws_signature_version: 4
-      path_style: true
   backups: |-
     [default]
     aws_access_key_id = {{ $awsAccessKey }}

diff --git a/common/zarf.yaml b/common/zarf.yaml
@@ -19,7 +19,7 @@ components:
         namespace: gitlab
         url: https://charts.gitlab.io/
         gitPath: chart
-        version: "8.5.2"
+        version: "8.6.1"
         valuesFiles:
           - ../values/common-values.yaml
       - name: uds-gitlab-settings

diff --git a/tasks/test.yaml b/tasks/test.yaml
@@ -63,15 +63,20 @@ tasks:
       # Cleanup the git repo
       - cmd: rm -rf "${PROJECT_NAME}"
         dir: tests/data
+      - cmd: |
+          echo "${GITLAB_TOKEN}" | docker login registry.uds.dev -u doug --password-stdin
+          docker pull nginx:latest
+          docker tag nginx:latest "registry.uds.dev/doug/${PROJECT_NAME}-firefox"
+          docker push "registry.uds.dev/doug/${PROJECT_NAME}-firefox"
 
   - name: bot-account
     description: Bot Account Access Tests
     actions:
       - cmd: kubectl get secret gitlab-test-bot -n test-bot -o jsonpath="{.data.TOKEN}" | base64 --decode
         setVariables:
-          - name: GITLAB_TOKEN
+          - name: GITLAB_BOT_TOKEN
       - cmd: |
-          response=$(curl --write-out "%{http_code}" --silent --output /dev/null --header "PRIVATE-TOKEN: $GITLAB_TOKEN" https://gitlab.uds.dev/api/v4/user)
+          response=$(curl --write-out "%{http_code}" --silent --output /dev/null --header "PRIVATE-TOKEN: $GITLAB_BOT_TOKEN" https://gitlab.uds.dev/api/v4/user)
 
           # Check if the status code is 200 (OK)
           if [ "$response" -eq 200 ]; then

diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
@@ -32,7 +32,7 @@ setup('authenticate', async ({ page, context }) => {
   await page.goto("/-/user_settings/ssh_keys")
   await page.getByRole('button', { name: "Add new key" }).click();
 
-  await page.getByLabel('Key').fill(process.env.SSH_PUBLIC_KEY!);
+  await page.getByLabel('Key', { exact: true}).fill(process.env.SSH_PUBLIC_KEY!);
   await page.getByRole('button', { name: "Add key" }).click();
 
   await page.goto('/dashboard/projects');

diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml
@@ -5,19 +5,19 @@ gitlab:
   webservice:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice
-      tag: 17.5.2
+      tag: 17.6.1
     workhorse:
       image: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse
       # renovate: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse versioning=semver
-      tag: 17.5.2
+      tag: 17.6.1
   sidekiq:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq
-      tag: 17.5.2
+      tag: 17.6.1
   migrations:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 17.5.2
+      tag: 17.6.1
   gitaly:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
@@ -30,42 +30,42 @@ gitlab:
   gitlab-exporter:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter
-      tag: 17.5.2
+      tag: 17.6.1
   gitlab-pages:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages
-      tag: 17.5.2
+      tag: 17.6.1
   gitlab-shell:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell
-      tag: 17.5.2
+      tag: 17.6.1
   praefect:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitaly
-      tag: 17.5.2
+      tag: 17.6.1
   toolbox:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox
-      tag: 17.5.2
+      tag: 17.6.1
 
 global:
   certificates:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/certificates
-      tag: 17.5.2
+      tag: 17.6.1
   gitlabBase:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
-      tag: 17.5.2
+      tag: 17.6.1
   kubectl:
     image:
       repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
-      tag: 17.5.2
+      tag: 17.6.1
 
 registry:
   image:
     repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry
-    tag: 17.5.2
+    tag: 17.6.1
 
 shared-secrets:
   selfsign:
@@ -76,4 +76,4 @@ shared-secrets:
 upgradeCheck:
   image:
     repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
-    tag: 17.5.2
+    tag: 17.6.1
diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml
@@ -5,19 +5,19 @@ gitlab:
   webservice:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee
-      tag: v17.5.2
+      tag: v17.6.1
     workhorse:
       image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee
       # renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee versioning=semver
-      tag: v17.5.2
+      tag: v17.6.1
   sidekiq:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee
-      tag: v17.5.2
+      tag: v17.6.1
   migrations:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v17.5.2
+      tag: v17.6.1
   gitaly:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
@@ -30,50 +30,50 @@ gitlab:
   gitlab-exporter:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
-      tag: v17.5.2
+      tag: v17.6.1
   gitlab-pages:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
-      tag: v17.5.2
+      tag: v17.6.1
   gitlab-shell:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
-      tag: v17.5.2
+      tag: v17.6.1
   praefect:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
-      tag: v17.5.2
+      tag: v17.6.1
   toolbox:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v17.5.2
+      tag: v17.6.1
 
 global:
   certificates:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/certificates
-      tag: v17.5.2
+      tag: v17.6.1
   gitlabBase:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
-      tag: v17.5.2
+      tag: v17.6.1
   kubectl:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
-      tag: v17.5.2
+      tag: v17.6.1
 
 registry:
   image:
     repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
-    tag: v17.5.2
+    tag: v17.6.1
 
 shared-secrets:
   selfsign:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
-      tag: v17.5.2
+      tag: v17.6.1
 
 upgradeCheck:
   image:
     repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
-    tag: v17.5.2
+    tag: v17.6.1
diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml
@@ -5,19 +5,19 @@ gitlab:
   webservice:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee
-      tag: v17.5.2
+      tag: v17.6.1
     workhorse:
       image: registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee
       # renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee versioning=semver
-      tag: v17.5.2
+      tag: v17.6.1
   sidekiq:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee
-      tag: v17.5.2
+      tag: v17.6.1
   migrations:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v17.5.2
+      tag: v17.6.1
   gitaly:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
@@ -30,50 +30,50 @@ gitlab:
   gitlab-exporter:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
-      tag: v17.5.2
+      tag: v17.6.1
   gitlab-pages:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
-      tag: v17.5.2
+      tag: v17.6.1
   gitlab-shell:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
-      tag: v17.5.2
+      tag: v17.6.1
   praefect:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
-      tag: v17.5.2
+      tag: v17.6.1
   toolbox:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
-      tag: v17.5.2
+      tag: v17.6.1
 
 global:
   certificates:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/certificates
-      tag: v17.5.2
+      tag: v17.6.1
   gitlabBase:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
-      tag: v17.5.2
+      tag: v17.6.1
   kubectl:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
-      tag: v17.5.2
+      tag: v17.6.1
 
 registry:
   image:
     repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
-    tag: v17.5.2
+    tag: v17.6.1
 
 shared-secrets:
   selfsign:
     image:
       repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
-      tag: v17.5.2
+      tag: v17.6.1
 
 upgradeCheck:
   image:
     repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
-    tag: v17.5.2
+    tag: v17.6.1
diff --git a/zarf.yaml b/zarf.yaml
@@ -55,7 +55,7 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.5.2"
+      - "registry1.dso.mil/ironbank/gitlab/gitlab/certificates:17.6.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign:1.6.1"
       - "registry1.dso.mil/ironbank/gitlab/gitlab/gitaly:17.5.2"
       - "registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups:v17.5.2"