Skip to content

Commit

Permalink
fix: update chart and swap images to fix update (#188)
Browse files Browse the repository at this point in the history
## Description

update chart to correct version and swap ubi images with gitlab-base


## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [x] Test, docs, adr added or updated as needed
- [x] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-gitlab/blob/main/CONTRIBUTING.md#developer-workflow)
followed

Release-As: 17.2.1-uds.1
  • Loading branch information
zachariahmiller authored Aug 8, 2024
1 parent 97b687e commit dbd955b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ components:
namespace: gitlab
url: https://charts.gitlab.io/
gitPath: chart
version: "8.1.3"
version: "8.2.1"
valuesFiles:
- ../values/common-values.yaml
actions:
Expand Down
8 changes: 4 additions & 4 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ global:
tag: 17.2.1
gitlabBase:
image:
repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
tag: "9.4"
repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
tag: 17.2.1
kubectl:
image:
repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
Expand All @@ -67,5 +67,5 @@ shared-secrets:

upgradeCheck:
image:
repository: registry1.dso.mil/ironbank/redhat/ubi/ubi9
tag: "9.4"
repository: registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
tag: 17.2.1
8 changes: 4 additions & 4 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ global:
tag: v17.2.1
gitlabBase:
image:
repository: docker.io/redhat/ubi9
tag: "9.4"
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.2.1
kubectl:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
Expand All @@ -67,5 +67,5 @@ shared-secrets:

upgradeCheck:
image:
repository: docker.io/redhat/ubi9
tag: "9.4"
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.2.1
4 changes: 2 additions & 2 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ components:
- "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-webservice:17.2.1"
- "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-workhorse:17.2.1"
- "registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:17.2.1"
- "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.4"
- "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base:17.2.1"
- "registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-exporter:17.2.1"

# Note: upstream flavor is experimental
Expand All @@ -85,5 +85,5 @@ components:
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.2.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.2.1"
- "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.2.1"
- "docker.io/redhat/ubi9:9.4"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.2.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.2.1"

0 comments on commit dbd955b

Please sign in to comment.