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.

Sign up for GitHub

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

feat: fully finalize unicorn flavor #217

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
+97 −94
Open

feat: fully finalize unicorn flavor #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
58a16c8
mostly unicorn flavor partially working
zachariahmiller Sep 26, 2024
e5c6f47
updates to unicorn flavor images
zachariahmiller Oct 24, 2024
0b5c8c6
resolve conflicts
zachariahmiller Oct 24, 2024
cdca12f
fix unsaved resolution
zachariahmiller Oct 24, 2024
fe47010
update missing flavor in matrix
zachariahmiller Oct 24, 2024
36b1bf1
fix missing newline
zachariahmiller Oct 24, 2024
61b47bc
fix missing newline
zachariahmiller Oct 24, 2024
0874c12
trailing spaces
zachariahmiller Oct 24, 2024
8e4cd4d
update chart and upstream to 17.5.1
zachariahmiller Oct 24, 2024
8ade99f
add fail-fast:true
zachariahmiller Oct 24, 2024
0a472f6
partial unicorn flavor for initial release
zachariahmiller Oct 28, 2024
523982f
Merge branch 'main' into unicorn_flavor
zachariahmiller Oct 28, 2024
e36ee07
Merge branch 'main' into unicorn_flavor
Racer159 Nov 5, 2024
1c12f59
Merge branch 'main' into unicorn_flavor
zachariahmiller Nov 21, 2024
847cbf4
update again
zachariahmiller Nov 21, 2024
c2ec823
closest to 17.5.2 chainguard
zachariahmiller Nov 21, 2024
685286c
Merge branch 'main' into unicorn_flavor
zachariahmiller Jan 13, 2025
9a716f5
chainguard updates
zachariahmiller Jan 13, 2025
e0a2184
chainguard updates
zachariahmiller Jan 13, 2025
96ab4a5
lint fixes
zachariahmiller Jan 13, 2025
f34f1ce
fix ssh test, update unicorn images, temporarily remove resources
zachariahmiller Jan 15, 2025
0797a3a
swap images missing patch release to 17.7
zachariahmiller Jan 15, 2025
79569e3
bump runner size
zachariahmiller Jan 15, 2025
7af2f84
change back to 17.7 temporarily while updated images get rolled out
zachariahmiller Jan 15, 2025
88712d7
change webservice memory limits for ci
zachariahmiller Jan 17, 2025
d6ea4ec
swap back to large runner
zachariahmiller Jan 17, 2025
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 .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ jobs:
upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
runsOn: uds-swf-ubuntu-big-boy-8-core
runsOn: uds-swf-ubuntu-big-boy-16-core
timeout: 30
secrets: inherit # Inherits all secrets from the parent workflow.
3 changes: 2 additions & 1 deletion bundle/uds-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
webservice_replicas: 1
webservice_resources:
limits:
memory: 2.5G
memory: 4G
requests:
cpu: 300m
memory: 2.5G
Expand Down Expand Up @@ -53,3 +53,4 @@
name: gitlab-test-bot
namespace: test-bot
keyName: TOKEN

Check failure on line 56 in bundle/uds-config.yaml

View workflow job for this annotation

GitHub Actions / validate / run 

56:1 [empty-lines] too many blank lines (1 > 0)
2 changes: 1 addition & 1 deletion common/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ components:
namespace: gitlab
url: https://charts.gitlab.io/
gitPath: chart
version: "8.6.2"
version: "8.7.3"
valuesFiles:
- ../values/common-values.yaml
- name: uds-gitlab-settings
Expand Down
6 changes: 4 additions & 2 deletions tasks/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tasks:
- cmd: echo "uds-package-test-$(date +%s)"
setVariables:
- name: PROJECT_NAME
- cmd: rm -f ./gitlab-test-ssh-key && ssh-keygen -t rsa -b 4096 -C "[email protected]" -f ./gitlab-test-ssh-key -P ""
- cmd: rm -f ./gitlab-test-ssh-key && ssh-keygen -t ecdsa -b 384 -C "[email protected]" -f ./gitlab-test-ssh-key -P ""
dir: tests/data
# Login, and create a project
- cmd: |
Expand All @@ -47,7 +47,9 @@ tasks:
# Pull the project via SSH (gateway -> gitlab-shell -> gitaly)
- cmd: |
mkdir -p "${PROJECT_NAME}" && cd "${PROJECT_NAME}" && git init
git config core.sshCommand "ssh -i ../gitlab-test-ssh-key -o StrictHostKeyChecking=no"
git config core.sshCommand "ssh -i ../gitlab-test-ssh-key -o StrictHostKeyChecking=no -o Ciphers=aes256-ctr \
-o KexAlgorithms=ecdh-sha2-nistp384 \
-o MACs=hmac-sha2-256"
git remote add origin "ssh://[email protected]:2223/doug/${PROJECT_NAME}-firefox.git"
git pull origin main
dir: tests/data
Expand Down
10 changes: 6 additions & 4 deletions values/common-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,7 @@ gitlab:
enabled: true

migrations:
resources:
limits:
cpu: 500m
memory: 4G


sidekiq:
metrics:
Expand Down Expand Up @@ -204,6 +201,11 @@ gitlab:
enabled: true
serviceMonitor:
enabled: true
config:
ciphers: ["aes128-ctr", "aes192-ctr", "aes256-ctr"]
kexAlgorithms: ["ecdh-sha2-nistp384", "ecdh-sha2-nistp521"]
macs: ["hmac-sha2-256", "hmac-sha2-512"]
publicKeyAlgorithms: ["ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521"]

certmanager:
install: false
Expand Down
4 changes: 2 additions & 2 deletions values/settings-unicorn-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
global:
kubectl:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips
tag: 1.32.0
2 changes: 1 addition & 1 deletion values/settings-upstream-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ global:
kubectl:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
tag: v17.6.2
tag: v17.7.1
71 changes: 34 additions & 37 deletions values/unicorn-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,73 @@
gitlab:
webservice:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-webservice-ee-fips
tag: "17.7"
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.6.2
image: cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips versioning=semver
tag: "17.7"
sidekiq:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-sidekiq-ee-fips
tag: "17.7"
migrations:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-toolbox-ee-fips
tag: "17.7"
gitaly:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitaly-fips
tag: "17.7"
cgroups:
initContainer:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups
tag: v17.6.2
tag: v17.7.1
gitlab-exporter:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips
tag: "17.7"
gitlab-pages:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips
tag: "17.7"
gitlab-shell:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips
tag: "17.7"
praefect:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitaly-fips
tag: "17.7"
toolbox:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
tag: v17.6.2

repository: cgr.dev/du-uds-defenseunicorns/gitlab-toolbox-ee-fips
tag: "17.7"
global:
certificates:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/certificates
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips
tag: "17.7"
gitlabBase:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips
tag: "17.7"
kubectl:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
tag: v17.6.2

repository: cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips
tag: 1.32.0
registry:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
tag: v17.6.2

repository: cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips
tag: "17.7"
shared-secrets:
selfsign:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips
tag: "17.7"

upgradeCheck:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.6.2
repository: cgr.dev/du-uds-defenseunicorns/gitlab-base-fips
tag: "17.7"
34 changes: 17 additions & 17 deletions values/upstream-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,75 @@ gitlab:
webservice:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee
tag: v17.6.2
tag: v17.7.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.6.2
tag: v17.7.1
sidekiq:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee
tag: v17.6.2
tag: v17.7.1
migrations:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
tag: v17.6.2
tag: v17.7.1
gitaly:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
tag: v17.6.2
tag: v17.7.1
cgroups:
initContainer:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups
tag: v17.6.2
tag: v17.7.1
gitlab-exporter:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter
tag: v17.6.2
tag: v17.7.1
gitlab-pages:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-pages
tag: v17.6.2
tag: v17.7.1
gitlab-shell:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-shell
tag: v17.6.2
tag: v17.7.1
praefect:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitaly
tag: v17.6.2
tag: v17.7.1
toolbox:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee
tag: v17.6.2
tag: v17.7.1

global:
certificates:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/certificates
tag: v17.6.2
tag: v17.7.1
gitlabBase:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.6.2
tag: v17.7.1
kubectl:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/kubectl
tag: v17.6.2
tag: v17.7.1

registry:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry
tag: v17.6.2
tag: v17.7.1

shared-secrets:
selfsign:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign
tag: v17.6.2
tag: v17.7.1

upgradeCheck:
image:
repository: registry.gitlab.com/gitlab-org/build/cng/gitlab-base
tag: v17.6.2
tag: v17.7.1
57 changes: 29 additions & 28 deletions zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@ components:
valuesFiles:
- values/settings-upstream-values.yaml
images:
- "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.7.1"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.7.1"

# Note: unicorn flavor is experimental
- name: gitlab
Expand All @@ -113,18 +113,19 @@ components:
- name: uds-gitlab-settings
valuesFiles:
- values/settings-unicorn-values.yaml
- values/settings-unicorn-values.yaml
images:
- "registry.gitlab.com/gitlab-org/build/cng/certificates:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/cfssl-self-sign:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-pages:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/kubectl:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-base:v17.6.2"
- "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:v17.6.2"
- "cgr.dev/du-uds-defenseunicorns/gitlab-certificates-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/cfssl-self-sign-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitaly-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-container-registry-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-pages-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-shell-fips:17.7"
- "registry.gitlab.com/gitlab-org/build/cng/gitaly-init-cgroups:v17.7.1"
- "cgr.dev/du-uds-defenseunicorns/gitlab-sidekiq-ee-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-toolbox-ee-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-workhorse-ee-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-webservice-ee-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-kubectl-fips:1.32.0"
- "cgr.dev/du-uds-defenseunicorns/gitlab-base-fips:17.7"
- "cgr.dev/du-uds-defenseunicorns/gitlab-exporter-fips:17.7"
Loading