Skip to content

Commit 060cf7d

Browse files
author
Daniel Gellert
committed
feat: allow multi anmespace deployments with namespaceOverride (#25)
1 parent 1cac468 commit 060cf7d

12 files changed

Lines changed: 29 additions & 10 deletions

charts/typesense-operator/templates/_helpers.tpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ If release name contains chart name it will be used as a full name.
2323
{{- end }}
2424
{{- end }}
2525

26+
{{/*
27+
Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
28+
*/}}
29+
{{- define "typesense-operator.namespace" -}}
30+
{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
31+
{{- end -}}
32+
2633
{{/*
2734
Create chart name and version as used by the chart label.
2835
*/}}

charts/typesense-operator/templates/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-controller-manager
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
control-plane: controller-manager
78
{{- include "typesense-operator.labels" . | nindent 4 }}
@@ -49,4 +50,4 @@ spec:
4950
securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
5051
8 }}
5152
serviceAccountName: {{ include "typesense-operator.fullname" . }}-controller-manager
52-
terminationGracePeriodSeconds: 10
53+
terminationGracePeriodSeconds: 10

charts/typesense-operator/templates/leader-election-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: Role
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-leader-election-role
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
@@ -50,4 +51,4 @@ roleRef:
5051
subjects:
5152
- kind: ServiceAccount
5253
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
53-
namespace: '{{ .Release.Namespace }}'
54+
namespace: {{ include "typesense-operator.namespace" . | quote }}

charts/typesense-operator/templates/manager-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-manager-role
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
@@ -179,4 +180,4 @@ roleRef:
179180
subjects:
180181
- kind: ServiceAccount
181182
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
182-
namespace: '{{ .Release.Namespace }}'
183+
namespace: {{ include "typesense-operator.namespace" . | quote }}

charts/typesense-operator/templates/metrics-auth-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-metrics-auth-role
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
@@ -31,4 +32,4 @@ roleRef:
3132
subjects:
3233
- kind: ServiceAccount
3334
name: '{{ include "typesense-operator.fullname" . }}-controller-manager'
34-
namespace: '{{ .Release.Namespace }}'
35+
namespace: {{ include "typesense-operator.namespace" . | quote }}

charts/typesense-operator/templates/metrics-reader-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-metrics-reader
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
89
- nonResourceURLs:
910
- /metrics
1011
verbs:
11-
- get
12+
- get

charts/typesense-operator/templates/metrics-service.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-controller-manager-metrics-service
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
control-plane: controller-manager
78
{{- include "typesense-operator.labels" . | nindent 4 }}
@@ -11,4 +12,4 @@ spec:
1112
control-plane: controller-manager
1213
{{- include "typesense-operator.selectorLabels" . | nindent 4 }}
1314
ports:
14-
{{- .Values.metricsService.ports | toYaml | nindent 2 }}
15+
{{- .Values.metricsService.ports | toYaml | nindent 2 }}

charts/typesense-operator/templates/serviceaccount.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-controller-manager
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
annotations:
8-
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
9+
{{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}

charts/typesense-operator/templates/typesensecluster-editor-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-typesensecluster-editor-role
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
@@ -22,4 +23,4 @@ rules:
2223
resources:
2324
- typesenseclusters/status
2425
verbs:
25-
- get
26+
- get

charts/typesense-operator/templates/typesensecluster-viewer-rbac.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ include "typesense-operator.fullname" . }}-typesensecluster-viewer-role
5+
namespace: {{ include "typesense-operator.namespace" . | quote }}
56
labels:
67
{{- include "typesense-operator.labels" . | nindent 4 }}
78
rules:
@@ -18,4 +19,4 @@ rules:
1819
resources:
1920
- typesenseclusters/status
2021
verbs:
21-
- get
22+
- get

0 commit comments

Comments
 (0)