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 #77

Merged
merged 6 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
43 changes: 43 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"debug.javascript.terminalOptions": {
"enableTurboSourcemaps": true,
"resolveSourceMapLocations": [
"${workspaceFolder}/**",
"node_modules/kubernetes-fluent-client/**",
"node_modules/pepr/**"
]
},
"yaml.schemas": {
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.1/uds.schema.json": [
"uds-bundle.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.1/tasks.schema.json": [
"tasks.yaml",
"tasks/**/*.yaml",
"src/**/validate.yaml"
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved
],
"https://raw.githubusercontent.com/defenseunicorns/zarf/v0.32.6/zarf.schema.json": [
"zarf.yaml"
]
},
"cSpell.words": [
"alertmanager",
"Authservice",
"automount",
"controlplane",
"crds",
"distros",
"ironbank",
"Kiali",
"Kyverno",
"MITM",
"neuvector",
"opensource",
"promtail",
"Quickstart",
"Gitlab",
"seccomp",
"Sysctls",
"Velero"
]
}
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved
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.63.0"
version: "0.64.0"
valuesFiles:
- ../values/common-values.yaml
actions:
Expand Down
24 changes: 24 additions & 0 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,29 @@ tasks:
spoof_release: "true"
- task: create:test-bundle

- name: test
description: Just test the health of Gitlab and Gitlab Runner deployments
actions:
- task: test:glr-run-check
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved

- name: dev
description: Deploy gitlab-runner on existing cluster with existing gitlab
actions:
- task: create-glr-package
- task: create-glr-test-bundle
- task: deploy:test-bundle

- name: create-user
description: create doug user
actions:
- task: setup:create-doug-user
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved

- name: doug-admin
description: Promote Doug to admin (requires running create-user and logging into gitlab ui first)
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved
actions:
- cmd: |
./uds zarf tools kubectl exec -n gitlab deployment/gitlab-toolbox -- gitlab-rails runner -e production "user = User.find_by(username: 'doug'); user.admin = true; user.save!"

# CI will execute the following (via uds-common/.github/actions/test) so they need to be here with these names

- name: test-package
Expand All @@ -56,6 +79,7 @@ tasks:
- task: setup:k3d-test-cluster
- task: dependencies:deploy
- task: deploy:test-bundle
- task: setup:create-doug-user
- task: create-glr-test-bundle
- task: deploy:test-bundle
- task: test:glr-health-check
Expand Down
2 changes: 1 addition & 1 deletion test/journey/pipeline-run.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test('test kicking off a pipeline run', async () => {
zarfExec([
"package",
"mirror-resources",
"zarf-package-gitlab-runner-test-amd64-0.0.1.tar.zst",
"zarf-package-gitlab-runner-test-*-0.0.1.tar.zst",
zachariahmiller marked this conversation as resolved.
Show resolved Hide resolved
"--git-url", "https://gitlab.uds.dev/",
"--git-push-username", "root",
"--git-push-password", rootPassword,
Expand Down
11 changes: 7 additions & 4 deletions values/common-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@ runners:

concurrent: 50

securityContext:
runAsUser: 1001
runAsGroup: 1001
podSecurityContext:
runAsUser: 100
fsGroup: 65534

containerSecurityContext:
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
privileged: false
capabilities:
drop: ["ALL"]


resources:
limits:
memory: 256Mi
Expand Down
6 changes: 3 additions & 3 deletions values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ useTini: true
image:
registry: "registry1.dso.mil"
image: "ironbank/gitlab/gitlab-runner/gitlab-runner"
tag: v16.10.0
tag: v16.11.0

runners:
job:
registry: registry1.dso.mil
repository: ironbank/redhat/ubi/ubi9
tag: "9.3"
tag: "9.4"
helper:
registry: registry1.dso.mil
repository: ironbank/gitlab/gitlab-runner/gitlab-runner-helper
tag: v16.10.0
tag: v16.11.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.10.0
tag: alpine-v16.11.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.10.0
tag: v16.11.0
10 changes: 5 additions & 5 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v16.10.0"
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v16.10.0"
- "registry1.dso.mil/ironbank/redhat/ubi/ubi9:9.3"
- "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/redhat/ubi/ubi9:9.4"

- name: gitlab-runner
required: true
Expand All @@ -40,6 +40,6 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- "registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v16.10.0" # renovate: versioning=regex:^alpine-v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$
- "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v16.10.0"
- "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+)?$