Skip to content

Commit

Permalink
Merge branch 'main' into renovate/gitlab-runner-support-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Racer159 authored May 28, 2024
2 parents 2f7fa6e + 8393282 commit 4ac9be2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ components:
- name: gitlab-runner
namespace: gitlab-runner
url: https://charts.gitlab.io
version: "0.64.0"
version: "0.65.0"
valuesFiles:
- ../values/common-values.yaml
actions:
Expand Down
4 changes: 2 additions & 2 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ useTini: true
image:
registry: "registry1.dso.mil"
image: "ironbank/gitlab/gitlab-runner/gitlab-runner"
tag: v16.11.0
tag: v17.0.0

runners:
job:
Expand All @@ -14,4 +14,4 @@ runners:
helper:
registry: registry1.dso.mil
repository: ironbank/gitlab/gitlab-runner/gitlab-runner-helper
tag: v16.11.0
tag: v17.0.0
4 changes: 2 additions & 2 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
registry: registry.gitlab.com
image: gitlab-org/gitlab-runner
tag: alpine-v16.11.0
tag: alpine-v17.0.0

runners:
job:
Expand All @@ -11,4 +11,4 @@ runners:
helper:
registry: registry1.dso.mil
repository: ironbank/gitlab/gitlab-runner/gitlab-runner-helper
tag: v16.11.0
tag: v17.0.0
10 changes: 5 additions & 5 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v16.11.0"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v16.11.0"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v17.0.0"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v17.0.0"
- "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.4"

- name: gitlab-runner
Expand All @@ -40,6 +40,6 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- "registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v16.11.0" # renovate: versioning=regex:^alpine-v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v16.11.0"
- "library/alpine:3.19.1" # renovate: versioning=regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$
- "registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v17.0.0"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v17.0.0"
- "library/alpine:3.19.1"

0 comments on commit 4ac9be2

Please sign in to comment.