Skip to content

Commit a839aa6

Browse files
committed
chore(gitlab-operator): add node targeting to amd64
ref: #5 https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/-/issues/244
1 parent a0afbb0 commit a839aa6

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

manifests/gitlab-operator/base/kustomization.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ patches:
6565
https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/-/raw/160ee6bf2ad4e05d0e673d0652cc47bd6100ddec/config/manager/auth_proxy_patch.yaml
6666
6767
# # Operator only has arch AMD64
68-
# - patch: |-
69-
# - op: replace
70-
# path: /spec/template/spec/affinity
71-
# value:
72-
# nodeAffinity:
73-
# requiredDuringSchedulingIgnoredDuringExecution:
74-
# nodeSelectorTerms:
75-
# - matchExpressions:
76-
# - key: kubernetes.io/arch
77-
# operator: In
78-
# values:
79-
# - amd64
80-
# target:
81-
# kind: Deployment
82-
# name: controller-manager
83-
# version: v1
68+
- patch: |-
69+
- op: replace
70+
path: /spec/template/spec/affinity
71+
value:
72+
nodeAffinity:
73+
requiredDuringSchedulingIgnoredDuringExecution:
74+
nodeSelectorTerms:
75+
- matchExpressions:
76+
- key: kubernetes.io/arch
77+
operator: In
78+
values:
79+
- amd64
80+
target:
81+
kind: Deployment
82+
name: controller-manager
83+
version: v1

manifests/gitlab-operator/components/runner/ConfigMap.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ data:
1212
shell = "bash"
1313
1414
[runners.kubernetes]
15-
namespace = "test"
16-
helper_image = "registry.gitlab.com/gitlab-org/gitlab-runner/gitlab-runner-helper:alpine-edge-x86_64-latest"
17-
image = "alpine"
1815
pull_policy = "if-not-present}"
1916
2017
cpu_limit = "100m"
@@ -38,8 +35,5 @@ data:
3835
read_only = false
3936
host_path = "/opt/webserver/nofusscomputing.com"
4037
41-
[runners.kubernetes.node_selector]
42-
"node-role.kubernetes.io/prime" = "true"
43-
4438
[runners.kubernetes.node_tolerations]
4539
"CriticalAddonsOnly=true" = "NoExecute"

manifests/gitlab-operator/components/runner/Runner.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ metadata:
99
app.kubernetes.io/part-of: nginx
1010
name: my-gitlab
1111
spec:
12+
buildImage: debian:stable-slim
13+
concurrent: 2
1214
config: gitlab-runner
1315
gitlabUrl: https://gitlab.com
16+
# helperImage:
1417
podSpec:
1518
- name: gitlab-runner
1619
patchType: merge

0 commit comments

Comments
 (0)