Skip to content

Commit

Permalink
chore: migrate to upstream chart (#72)
Browse files Browse the repository at this point in the history
## Description
Update to use upstream chart.

## Related Issue

Fixes #16 

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] 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
  • Loading branch information
ericwyles authored Apr 19, 2024
1 parent 5af09cb commit b0e151e
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ components:
localPath: ../charts/sso
- name: gitlab
namespace: gitlab
url: https://repo1.dso.mil/big-bang/product/packages/gitlab.git
url: https://charts.gitlab.io/
gitPath: chart
version: "7.10.2-bb.0"
version: "7.10.2"
valuesFiles:
- ../values/common-values.yaml
30 changes: 30 additions & 0 deletions values/common-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ global:
image:
pullPolicy: IfNotPresent

ingress:
configureCertmanager: false

kas:
enabled: false

hosts:
domain: ###ZARF_VAR_DOMAIN###
gitlab:
Expand Down Expand Up @@ -86,6 +92,14 @@ global:
objectStore:
bucket: ###ZARF_VAR_BUCKET_PREFIX###gitlab-pages###ZARF_VAR_BUCKET_SUFFIX###

## https://docs.gitlab.com/charts/charts/globals#service-accounts
serviceAccount:
enabled: true
create: true
annotations: {}
## Name to be used for serviceAccount, otherwise defaults to chart fullname
# name:

postgresql:
install: false
redis:
Expand All @@ -97,6 +111,7 @@ registry:
secret: gitlab-object-store
key: registry
metrics:
enabled: true
serviceMonitor: # TODO configure for Prometheus
enabled: true

Expand Down Expand Up @@ -125,5 +140,20 @@ gitlab:
port: 8083
serviceMonitor:
enabled: true
workhorse:
metrics:
enabled: true

certmanager:
install: false

gitlab-runner:
install: false

prometheus:
install: false

nginx-ingress: &nginx-ingress
enabled: false

domain: ###ZARF_VAR_DOMAIN###
1 change: 1 addition & 0 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ shared-secrets:
selfsign:
image:
repository: registry1.dso.mil/ironbank/gitlab/gitlab/cfssl-self-sign
tag: 1.6.1

upgradeCheck:
image:
Expand Down

0 comments on commit b0e151e

Please sign in to comment.