Skip to content

Commit 3c1a323

Browse files
fernandezcuestanikola-jokic
fernandezcuesta
and
nikola-jokic
authored
feat: allow namespace overrides (#3797)
Signed-off-by: Jesús Fernández <[email protected]> Co-authored-by: Nikola Jokic <[email protected]>
1 parent fb9b96b commit 3c1a323

File tree

56 files changed

+427
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+427
-92
lines changed

‎charts/actions-runner-controller/templates/NOTES.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
{{- end }}
77
{{- end }}
88
{{- else if contains "NodePort" .Values.service.type }}
9-
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "actions-runner-controller.fullname" . }})
10-
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
9+
export NODE_PORT=$(kubectl get --namespace {{ include "actions-runner-controller.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "actions-runner-controller.fullname" . }})
10+
export NODE_IP=$(kubectl get nodes --namespace {{ include "actions-runner-controller.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
1111
echo http://$NODE_IP:$NODE_PORT
1212
{{- else if contains "LoadBalancer" .Values.service.type }}
1313
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
14-
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "actions-runner-controller.fullname" . }}'
15-
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "actions-runner-controller.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
14+
You can watch the status of by running 'kubectl get --namespace {{ include "actions-runner-controller.namespace" . }} svc -w {{ include "actions-runner-controller.fullname" . }}'
15+
export SERVICE_IP=$(kubectl get svc --namespace {{ include "actions-runner-controller.namespace" . }} {{ include "actions-runner-controller.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
1616
echo http://$SERVICE_IP:{{ .Values.service.port }}
1717
{{- else if contains "ClusterIP" .Values.service.type }}
18-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "actions-runner-controller.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
19-
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
18+
export POD_NAME=$(kubectl get pods --namespace {{ include "actions-runner-controller.namespace" . }} -l "app.kubernetes.io/name={{ include "actions-runner-controller.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
19+
export CONTAINER_PORT=$(kubectl get pod --namespace {{ include "actions-runner-controller.namespace" . }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
2020
echo "Visit http://127.0.0.1:8080 to use your application"
21-
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
21+
kubectl --namespace {{ include "actions-runner-controller.namespace" . }} port-forward $POD_NAME 8080:$CONTAINER_PORT
2222
{{- end }}

‎charts/actions-runner-controller/templates/_helpers.tpl

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
{{/*
2+
Allow overriding the namespace for the resources.
3+
*/}}
4+
{{- define "actions-runner-controller.namespace" -}}
5+
{{- if .Values.namespaceOverride }}
6+
{{- .Values.namespaceOverride }}
7+
{{- else }}
8+
{{- .Release.Namespace }}
9+
{{- end }}
10+
{{- end }}
11+
112
{{/*
213
Expand the name of the chart.
314
*/}}

‎charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: {{ include "actions-runner-controller-actions-metrics-server.fullname" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
labels:
88
{{- include "actions-runner-controller.labels" . | nindent 4 }}
99
spec:

‎charts/actions-runner-controller/templates/actionsmetrics.ingress.yaml.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1
55
kind: Ingress
66
metadata:
77
name: {{ $fullName }}
8-
namespace: {{ .Release.Namespace }}
8+
namespace: {{ include "actions-runner-controller.namespace" . }}
99
labels:
1010
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1111
{{- with .Values.actionsMetricsServer.ingress.annotations }}

‎charts/actions-runner-controller/templates/actionsmetrics.role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ roleRef:
1010
subjects:
1111
- kind: ServiceAccount
1212
name: {{ include "actions-runner-controller-actions-metrics-server.serviceAccountName" . }}
13-
namespace: {{ .Release.Namespace }}
13+
namespace: {{ include "actions-runner-controller.namespace" . }}
1414
{{- end }}

‎charts/actions-runner-controller/templates/actionsmetrics.secrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Secret
55
metadata:
66
name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
7-
namespace: {{ .Release.Namespace }}
7+
namespace: {{ include "actions-runner-controller.namespace" . }}
88
labels:
99
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1010
type: Opaque

‎charts/actions-runner-controller/templates/actionsmetrics.service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v1
33
kind: Service
44
metadata:
55
name: {{ include "actions-runner-controller-actions-metrics-server.fullname" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
labels:
88
{{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 4 }}
99
{{- if .Values.actionsMetricsServer.service.annotations }}

‎charts/actions-runner-controller/templates/actionsmetrics.serviceaccount.yaml.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: ServiceAccount
55
metadata:
66
name: {{ include "actions-runner-controller-actions-metrics-server.serviceAccountName" . }}
7-
namespace: {{ .Release.Namespace }}
7+
namespace: {{ include "actions-runner-controller.namespace" . }}
88
labels:
99
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1010
{{- with .Values.actionsMetricsServer.serviceAccount.annotations }}

‎charts/actions-runner-controller/templates/actionsmetrics.servicemonitor.yaml.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if and .Values.actionsMetricsServer.enabled .Values.actionsMetrics.serviceMonitor.enable }}
2-
{{- $servicemonitornamespace := .Values.actionsMetrics.serviceMonitor.namespace | default .Release.Namespace }}
2+
{{- $servicemonitornamespace := .Values.actionsMetrics.serviceMonitor.namespace | default (include "actions-runner-controller.namespace" .) }}
33
apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:

‎charts/actions-runner-controller/templates/auth_proxy_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ roleRef:
1010
subjects:
1111
- kind: ServiceAccount
1212
name: {{ include "actions-runner-controller.serviceAccountName" . }}
13-
namespace: {{ .Release.Namespace }}
13+
namespace: {{ include "actions-runner-controller.namespace" . }}
1414
{{- end }}

‎charts/actions-runner-controller/templates/certificate.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ apiVersion: cert-manager.io/v1
66
kind: Issuer
77
metadata:
88
name: {{ include "actions-runner-controller.selfsignedIssuerName" . }}
9-
namespace: {{ .Release.Namespace }}
9+
namespace: {{ include "actions-runner-controller.namespace" . }}
1010
spec:
1111
selfSigned: {}
1212
---
1313
apiVersion: cert-manager.io/v1
1414
kind: Certificate
1515
metadata:
1616
name: {{ include "actions-runner-controller.servingCertName" . }}
17-
namespace: {{ .Release.Namespace }}
17+
namespace: {{ include "actions-runner-controller.namespace" . }}
1818
spec:
1919
dnsNames:
20-
- {{ include "actions-runner-controller.webhookServiceName" . }}.{{ .Release.Namespace }}.svc
21-
- {{ include "actions-runner-controller.webhookServiceName" . }}.{{ .Release.Namespace }}.svc.cluster.local
20+
- {{ include "actions-runner-controller.webhookServiceName" . }}.{{ include "actions-runner-controller.namespace" . }}.svc
21+
- {{ include "actions-runner-controller.webhookServiceName" . }}.{{ include "actions-runner-controller.namespace" . }}.svc.cluster.local
2222
issuerRef:
2323
kind: Issuer
2424
name: {{ include "actions-runner-controller.selfsignedIssuerName" . }}

‎charts/actions-runner-controller/templates/controller.metrics.service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
{{- include "actions-runner-controller.labels" . | nindent 4 }}
66
name: {{ include "actions-runner-controller.metricsServiceName" . }}
7-
namespace: {{ .Release.Namespace }}
7+
namespace: {{ include "actions-runner-controller.namespace" . }}
88
{{- with .Values.metrics.serviceAnnotations }}
99
annotations:
1010
{{- toYaml . | nindent 4 }}

‎charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
{{- toYaml . | nindent 4 }}
99
{{- end }}
1010
name: {{ include "actions-runner-controller.serviceMonitorName" . }}
11-
namespace: {{ .Release.Namespace }}
11+
namespace: {{ include "actions-runner-controller.namespace" . }}
1212
spec:
1313
endpoints:
1414
- path: /metrics

‎charts/actions-runner-controller/templates/controller.pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
{{- include "actions-runner-controller.labels" . | nindent 4 }}
77
name: {{ include "actions-runner-controller.pdbName" . }}
8-
namespace: {{ .Release.Namespace }}
8+
namespace: {{ include "actions-runner-controller.namespace" . }}
99
spec:
1010
{{- if .Values.podDisruptionBudget.minAvailable }}
1111
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}

‎charts/actions-runner-controller/templates/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: {{ include "actions-runner-controller.fullname" . }}
5-
namespace: {{ .Release.Namespace }}
5+
namespace: {{ include "actions-runner-controller.namespace" . }}
66
labels:
77
{{- include "actions-runner-controller.labels" . | nindent 4 }}
88
spec:
@@ -56,7 +56,7 @@ spec:
5656
- "--docker-registry-mirror={{ .Values.dockerRegistryMirror }}"
5757
{{- end }}
5858
{{- if .Values.scope.singleNamespace }}
59-
- "--watch-namespace={{ default .Release.Namespace .Values.scope.watchNamespace }}"
59+
- "--watch-namespace={{ default (include "actions-runner-controller.namespace" .) .Values.scope.watchNamespace }}"
6060
{{- end }}
6161
{{- if .Values.logLevel }}
6262
- "--log-level={{ .Values.logLevel }}"

‎charts/actions-runner-controller/templates/githubwebhook.deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: {{ include "actions-runner-controller-github-webhook-server.fullname" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
labels:
88
{{- include "actions-runner-controller.labels" . | nindent 4 }}
99
spec:
@@ -43,7 +43,7 @@ spec:
4343
- "--log-level={{ .Values.githubWebhookServer.logLevel }}"
4444
{{- end }}
4545
{{- if .Values.scope.singleNamespace }}
46-
- "--watch-namespace={{ default .Release.Namespace .Values.scope.watchNamespace }}"
46+
- "--watch-namespace={{ default (include "actions-runner-controller.namespace" .) .Values.scope.watchNamespace }}"
4747
{{- end }}
4848
{{- if .Values.runnerGithubURL }}
4949
- "--runner-github-url={{ .Values.runnerGithubURL }}"

‎charts/actions-runner-controller/templates/githubwebhook.ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1
55
kind: Ingress
66
metadata:
77
name: {{ $fullName }}
8-
namespace: {{ .Release.Namespace }}
8+
namespace: {{ include "actions-runner-controller.namespace" . }}
99
labels:
1010
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1111
{{- with .Values.githubWebhookServer.ingress.annotations }}

‎charts/actions-runner-controller/templates/githubwebhook.pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
{{- include "actions-runner-controller.labels" . | nindent 4 }}
77
name: {{ include "actions-runner-controller-github-webhook-server.pdbName" . }}
8-
namespace: {{ .Release.Namespace }}
8+
namespace: {{ include "actions-runner-controller.namespace" . }}
99
spec:
1010
{{- if .Values.githubWebhookServer.podDisruptionBudget.minAvailable }}
1111
minAvailable: {{ .Values.githubWebhookServer.podDisruptionBudget.minAvailable }}

‎charts/actions-runner-controller/templates/githubwebhook.role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ roleRef:
1010
subjects:
1111
- kind: ServiceAccount
1212
name: {{ include "actions-runner-controller-github-webhook-server.serviceAccountName" . }}
13-
namespace: {{ .Release.Namespace }}
13+
namespace: {{ include "actions-runner-controller.namespace" . }}
1414
{{- end }}

‎charts/actions-runner-controller/templates/githubwebhook.secrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Secret
55
metadata:
66
name: {{ include "actions-runner-controller-github-webhook-server.secretName" . }}
7-
namespace: {{ .Release.Namespace }}
7+
namespace: {{ include "actions-runner-controller.namespace" . }}
88
labels:
99
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1010
type: Opaque

‎charts/actions-runner-controller/templates/githubwebhook.service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v1
33
kind: Service
44
metadata:
55
name: {{ include "actions-runner-controller-github-webhook-server.fullname" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
labels:
88
{{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 4 }}
99
{{- if .Values.githubWebhookServer.service.annotations }}

‎charts/actions-runner-controller/templates/githubwebhook.serviceMonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if and .Values.githubWebhookServer.enabled .Values.metrics.serviceMonitor.enable }}
2-
{{- $servicemonitornamespace := .Values.actionsMetrics.serviceMonitor.namespace | default .Release.Namespace }}
2+
{{- $servicemonitornamespace := .Values.actionsMetrics.serviceMonitor.namespace | default (include "actions-runner-controller.namespace" .) }}
33
apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:

‎charts/actions-runner-controller/templates/githubwebhook.serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: ServiceAccount
55
metadata:
66
name: {{ include "actions-runner-controller-github-webhook-server.serviceAccountName" . }}
7-
namespace: {{ .Release.Namespace }}
7+
namespace: {{ include "actions-runner-controller.namespace" . }}
88
labels:
99
{{- include "actions-runner-controller.labels" . | nindent 4 }}
1010
{{- with .Values.githubWebhookServer.serviceAccount.annotations }}

‎charts/actions-runner-controller/templates/leader_election_role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
name: {{ include "actions-runner-controller.leaderElectionRoleName" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
rules:
88
- apiGroups:
99
- ""

‎charts/actions-runner-controller/templates/leader_election_role_binding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: RoleBinding
33
metadata:
44
name: {{ include "actions-runner-controller.leaderElectionRoleName" . }}
5-
namespace: {{ .Release.Namespace }}
5+
namespace: {{ include "actions-runner-controller.namespace" . }}
66
roleRef:
77
apiGroup: rbac.authorization.k8s.io
88
kind: Role
99
name: {{ include "actions-runner-controller.leaderElectionRoleName" . }}
1010
subjects:
1111
- kind: ServiceAccount
1212
name: {{ include "actions-runner-controller.serviceAccountName" . }}
13-
namespace: {{ .Release.Namespace }}
13+
namespace: {{ include "actions-runner-controller.namespace" . }}

‎charts/actions-runner-controller/templates/manager_role_binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ roleRef:
99
subjects:
1010
- kind: ServiceAccount
1111
name: {{ include "actions-runner-controller.serviceAccountName" . }}
12-
namespace: {{ .Release.Namespace }}
12+
namespace: {{ include "actions-runner-controller.namespace" . }}

‎charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kind: ClusterRoleBinding
66
{{- end }}
77
metadata:
88
name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
9-
namespace: {{ .Release.Namespace }}
9+
namespace: {{ include "actions-runner-controller.namespace" . }}
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io
1212
{{- if .Values.scope.singleNamespace }}
@@ -18,4 +18,4 @@ roleRef:
1818
subjects:
1919
- kind: ServiceAccount
2020
name: {{ include "actions-runner-controller.serviceAccountName" . }}
21-
namespace: {{ .Release.Namespace }}
21+
namespace: {{ include "actions-runner-controller.namespace" . }}

‎charts/actions-runner-controller/templates/manager_secrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v1
33
kind: Secret
44
metadata:
55
name: {{ include "actions-runner-controller.secretName" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
{{- if .Values.authSecret.annotations }}
88
annotations:
99
{{ toYaml .Values.authSecret.annotations | nindent 4 }}

‎charts/actions-runner-controller/templates/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: {{ include "actions-runner-controller.serviceAccountName" . }}
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "actions-runner-controller.namespace" . }}
77
labels:
88
{{- include "actions-runner-controller.labels" . | nindent 4 }}
99
{{- with .Values.serviceAccount.annotations }}

0 commit comments

Comments
 (0)