Skip to content
Snippets Groups Projects
Verified Commit 57898d6f authored by Sheogorath's avatar Sheogorath :european_castle:
Browse files

fix(gitlab-runner): Fix cleanup controller

This patch replaces the plain pod with with a more sustainable
deployments which will also survive draining and automatic recreation of
pods.
parent 939b6ad3
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 ...@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
name: pod-cleanup-role name: pod-cleanup-role
namespace: gitlab-runner
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["pods"] resources: ["pods"]
...@@ -12,6 +13,7 @@ apiVersion: rbac.authorization.k8s.io/v1 ...@@ -12,6 +13,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: pod-cleanup-role-binding name: pod-cleanup-role-binding
namespace: gitlab-runner
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
...@@ -19,34 +21,47 @@ roleRef: ...@@ -19,34 +21,47 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: pod-cleanup-sa name: pod-cleanup-sa
namespace: gitlab-runner
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: pod-cleanup-sa name: pod-cleanup-sa
namespace: gitlab-runner
--- ---
apiVersion: apps/v1
apiVersion: v1 kind: Deployment
kind: Pod
metadata: metadata:
name: gitlab-runner-pod-cleanup labels:
app.kubernetes.io/name: pod-cleanup
name: pod-cleanup
namespace: gitlab-runner
spec: spec:
restartPolicy: Always replicas: 2
serviceAccountName: pod-cleanup-sa selector:
containers: matchLabels:
- name: gitlab-runner-pod-cleanup app.kubernetes.io/name: pod-cleanup
image: registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-pod-cleanup:latest template:
resources: metadata:
requests: labels:
cpu: 10m app.kubernetes.io/name: pod-cleanup
memory: 64Mi spec:
limits: restartPolicy: Always
cpu: 250m serviceAccountName: pod-cleanup-sa
memory: 512Mi containers:
securityContext: - name: gitlab-runner-pod-cleanup
capabilities: image: registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-pod-cleanup:latest
drop: ["all"] resources:
add: [] requests:
runAsNonRoot: true cpu: 10m
runAsUser: 1000 memory: 64Mi
\ No newline at end of file limits:
cpu: 250m
memory: 512Mi
securityContext:
capabilities:
drop: ["all"]
add: []
runAsNonRoot: true
runAsUser: 1000
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment