Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update gitlab runner package dependencies #118

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ components:
- name: gitlab-runner
namespace: gitlab-runner
url: https://charts.gitlab.io
version: "0.68.1"
version: "0.72.0"
valuesFiles:
- ../values/common-values.yaml
images:
Expand Down
4 changes: 2 additions & 2 deletions plugins/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

# Stage 1: Pull the image and prepare the registry layout
FROM alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d AS prep
FROM alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 AS prep

ARG TARGETARCH

Expand Down Expand Up @@ -103,7 +103,7 @@ RUN <<EXE
EXE

# Stage 2: Build the final registry image
FROM registry:2.8.3@sha256:ac0192b549007e22998eb74e8d8488dcfe70f1489520c3b144a6047ac5efbe90
FROM registry:2.8.3@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7384c9a5a8dbecc2be5136079ddb

# Copy the prepared registry layout from the build stage
COPY --from=prep /registry_data/docker/registry/v2/ /var/lib/registry/docker/registry/v2/
Expand Down
6 changes: 3 additions & 3 deletions releaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
flavors:
- name: upstream
# renovate-uds: datasource=docker depName=registry.gitlab.com/gitlab-org/gitlab-runner extractVersion=^alpine-v(?<version>\d+\.\d+\.\d+)$
version: 17.2.1-uds.7
version: 17.7.0-uds.0
- name: registry1
# renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner extractVersion=^v(?<version>\d+\.\d+\.\d+)$
version: 17.2.1-uds.7
version: 17.5.4-uds.0
- name: unicorn
# renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-runner-fips
version: 17.2.1-uds.7
version: 17.7.0-uds.0
8 changes: 4 additions & 4 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ image:
registry: "registry1.dso.mil"
image: "ironbank/gitlab/gitlab-runner/gitlab-runner"
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner versioning=semver
tag: v17.2.1
tag: v17.5.4

runners:
job:
registry: "###ZARF_REGISTRY###"
repository: ironbank/redhat/ubi/ubi9
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/redhat/ubi/ubi9 versioning=semver
tag: "9.4"
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/redhat/ubi/ubi9 versioning=docker
tag: "9.5"
helper:
registry: "###ZARF_REGISTRY###"
repository: ironbank/gitlab/gitlab-runner/gitlab-runner-helper
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper versioning=semver
tag: v17.2.1
tag: v17.3.1
5 changes: 3 additions & 2 deletions values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
image:
registry: cgr.dev
image: du-uds-defenseunicorns/gitlab-runner-fips
tag: "17.2.1"
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-runner-fips versioning=semver
tag: "17.7.0"

runners:
job:
Expand All @@ -16,7 +17,7 @@ runners:
registry: "###ZARF_REGISTRY###"
repository: du-uds-defenseunicorns/gitlab-runner-helper-fips
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-runner-helper-fips versioning=semver
tag: "17.2.1"
tag: "17.7.0"
securityContext:
runAsNonRoot: true
runAsUser: 65532
Expand Down
8 changes: 4 additions & 4 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
image:
registry: registry.gitlab.com
image: gitlab-org/gitlab-runner
# renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/gitlab-runner versioning=semver extractVersion=^alpine-(?<version>.*)$
tag: alpine-v17.2.1
# renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/gitlab-runner versioning=semver extractVersion=^alpine-v(?<version>\\d+\\.\\d+\\.\\d+)$
tag: alpine-v17.7.0

runners:
job:
registry: "###ZARF_REGISTRY###"
repository: library/alpine
# renovate: datasource=docker depName=library/alpine versioning=semver
tag: "3.20.2"
tag: "3.21.0"
helper:
registry: "###ZARF_REGISTRY###"
repository: gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-helper-ocp
# renovate: datasource=docker depName=registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-helper-ocp versioning=semver
tag: v17.2.1
tag: v17.7.0
16 changes: 8 additions & 8 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v17.2.1"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v17.2.1"
- "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.4"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v17.5.4"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v17.3.1"
- "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.5"

- name: gitlab-runner
required: true
Expand All @@ -50,9 +50,9 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- "registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v17.2.1" # renovate: extractVersion=^alpine-(?<version>.*)$
- "registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-helper-ocp:v17.2.1"
- "library/alpine:3.20.2"
- "registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v17.7.0" # renovate: extractVersion=^alpine-v(?<version>\\d+\\.\\d+\\.\\d+)$
- "registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-helper-ocp:v17.7.0"
- "library/alpine:3.21.0"

- name: gitlab-runner
required: true
Expand All @@ -66,6 +66,6 @@ components:
valuesFiles:
- values/unicorn-values.yaml
images:
- "cgr.dev/du-uds-defenseunicorns/gitlab-runner-fips:17.2.1"
- "cgr.dev/du-uds-defenseunicorns/gitlab-runner-helper-fips:17.2.1"
- "cgr.dev/du-uds-defenseunicorns/gitlab-runner-fips:17.7.0"
- "cgr.dev/du-uds-defenseunicorns/gitlab-runner-helper-fips:17.7.0"
- "cgr.dev/du-uds-defenseunicorns/busybox-fips:1.37.0"
Loading