chore(deps): update gitlab package dependencies (#247)

This PR contains the following updates: | Package | Update | Change | |---|---|---| | ghcr.io/defenseunicorns/packages/uds/valkey | patch | `8.0.1-uds.0-upstream` -> `8.0.1-uds.1-upstream` | | [gitlab](https://about.gitlab.com/) ([source](https://gitlab.com/gitlab-org/charts/gitlab)) | minor | `8.5.2` -> `8.6.1` | | registry.gitlab.com/gitlab-org/build/cng/certificates | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitaly | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-base | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-pages | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-shell | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee | minor | `v17.5.2` -> `v17.6.1` | | registry.gitlab.com/gitlab-org/build/cng/kubectl | minor | `v17.5.2` -> `v17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/certificates](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/certificates)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitaly](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitaly)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-base)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-container-registry](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-container-registry)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-exporter)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-pages](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-pages)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-shell](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-shell)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-sidekiq](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-sidekiq)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-toolbox](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-toolbox)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-webservice)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/gitlab-workhorse)) | minor | `17.5.2` -> `17.6.1` | | [registry1.dso.mil/ironbank/gitlab/gitlab/kubectl](https://about.gitlab.com/) ([source](https://repo1.dso.mil/dsop/gitlab/distroless/kubectl)) | minor | `17.5.2` -> `17.6.1` | --- ### Release Notes <details> <summary>gitlab-org/charts/gitlab (gitlab)</summary> ### [`v8.6.1`](https://gitlab.com/gitlab-org/charts/gitlab/blob/HEAD/CHANGELOG.md#861-2024-11-26) [Compare Source](https://gitlab.com/gitlab-org/charts/gitlab/compare/v8.6.0...v8.6.1) No changes. ### [`v8.6.0`](https://gitlab.com/gitlab-org/charts/gitlab/blob/HEAD/CHANGELOG.md#860-2024-11-20) [Compare Source](https://gitlab.com/gitlab-org/charts/gitlab/compare/v8.5.3...v8.6.0) ##### Added (2 changes) - [Support new PAT feature in GitLab Shell](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/7741ec22bdbede136cb8c06e488aa025765a2b0b) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3997)) - [Add annotations support to mailroom chart](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/46665cd8f93b351bb240cf716c9345e866e915d1) by [@loliee](https://redirect.github.com/loliee) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3946)) ##### Changed (11 changes) - [Update Helm release cert-manager to v1.12.14](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/0c024b2dd34be3c2e72360cbf3605987e27878f6) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/4005)) - [Update dependency gitlab-qa to v14.20.0](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/d58309f363d2490c354620359a4431f7f1eb6ba9) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3992)) - [Update dependency gitlab-qa to v14.19.2](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/7e84c8fbbdff92cbba243750c7366d56b0fb5a99) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3981)) - [Update dependency container-registry to v4.13.0-gitlab](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/43a990baa13a5bdd0c4368b0b5e8b76d5c3331ba) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3980)) - [Update Helm release gitlab-runner to v0.70.3](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/8f17dfb74a2b6fb3daf686da81fb7488c677d276) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3965)) - [Update dependency container-registry to v4.12.0-gitlab](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/15c6836b1401f90d377c8d3ed53ce22d70f34347) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3970)) - [Update dependency gitlab-qa to v14.19.1](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/08d2813a4acb78c73f394d6abd857a185ae84ebf) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3962)) - [Update dependency container-registry to v4.11.0-gitlab](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/3811c509baf363e79227629b1471beea7dc99048) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3961)) - [Update Helm release gitlab-runner to v0.70.1](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/b82f0a50ae6ec26a79fe9cc307c862c816f3ac78) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3958)) - [Update Helm release gitlab-runner to v0.70.0](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/ea3833fd35e5d201c96e9da5b4892b610df19781) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3955)) - [Bump nginx-controller from 1.3.1 to 1.11.2](https://gitlab.com/gitlab-org/charts/gitlab/-/commit/c8f6090ec807dde86d4f6fd92803ada8b125868e) ([merge request](https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3901)) ### [`v8.5.3`](https://gitlab.com/gitlab-org/charts/gitlab/blob/HEAD/CHANGELOG.md#853-2024-11-26) [Compare Source](https://gitlab.com/gitlab-org/charts/gitlab/compare/v8.5.2...v8.5.3) ##### Changed (1 change) - [Update Helm release gitlab-runner to v0.70.3](https://gitlab.com/gitlab-org/security/charts/gitlab/-/commit/657e3f8162b87547af92a5f23daca717491c071c) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 7am and before 9am every weekday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/uds-package-gitlab).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <[email protected]> Release-As: v17.6.1-uds.0
defenseunicorns · Dec 3, 2024 · c82a10a · c82a10a
1 parent eeaa2d5
commit c82a10a
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 95 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,62 +5,62 @@ 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
-      tag: 17.5.2
+      tag: 17.6.1
   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:
@@ -71,4 +71,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,70 +5,70 @@ 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
-      tag: v17.5.2
+      tag: v17.6.1
   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,70 +5,70 @@ 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
-      tag: v17.5.2
+      tag: v17.6.1
   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