Skip to content

Commit 3c1a323

Browse files
feat: allow namespace overrides (#3797)
Signed-off-by: Jesús Fernández <7312236+fernandezcuesta@users.noreply.github.com> Co-authored-by: Nikola Jokic <jokicnikola07@gmail.com>
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

Lines changed: 7 additions & 7 deletions
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

Lines changed: 11 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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 }}

0 commit comments

Comments
 (0)