feat: Allow the Helm release namespace to be overridden

for multi-namespace deployments in combined charts Signed-off-by: Mathieu Parent <[email protected]>
minio · Oct 11, 2023 · e65b3ab · e65b3ab
1 parent d619113
commit e65b3ab
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 2 deletions.
diff --git a/helm/tenant/templates/NOTES.txt b/helm/tenant/templates/NOTES.txt
@@ -2,11 +2,11 @@
   To connect to the {{ .name }} tenant if it doesn't have a service exposed, you can port-forward to it by running:
   {{- if dig "certificate" "requestAutoCert" false . }}
 
-  kubectl --namespace {{ $.Release.Namespace }} port-forward svc/{{ .name }}-console 9443:9443
+  kubectl --namespace {{ template "minio-operator.namespace" $ }} port-forward svc/{{ .name }}-console 9443:9443
 
   Then visit the MinIO Console at https://127.0.0.1:9443
   {{ else }}
-  kubectl --namespace {{ $.Release.Namespace }} port-forward svc/{{ .name }}-console 9090:9090
+  kubectl --namespace {{ template "minio-operator.namespace" $ }} port-forward svc/{{ .name }}-console 9090:9090
 
   Then visit the MinIO Console at http://127.0.0.1:9090
   {{ end }}

diff --git a/helm/tenant/templates/_helpers.tpl b/helm/tenant/templates/_helpers.tpl
@@ -20,6 +20,17 @@ If release name contains chart name it will be used as a full name.
   {{- end -}}
 {{- end -}}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "minio-operator.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Expand the name of the Operator Console.
 */}}

diff --git a/helm/tenant/templates/api-ingress.yaml b/helm/tenant/templates/api-ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.tenant.name }}
+  namespace: {{ template "minio-operator.namespace" $ }}
   {{- with .Values.ingress.api.labels }}
   labels: {{ toYaml . | nindent 4 }}
   {{- end }}

diff --git a/helm/tenant/templates/console-ingress.yaml b/helm/tenant/templates/console-ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.tenant.name }}-console
+  namespace: {{ template "minio-operator.namespace" $ }}
   {{- with .Values.ingress.console.labels }}
   labels: {{ toYaml . | nindent 4 }}
   {{- end }}

diff --git a/helm/tenant/templates/kes-configuration-secret.yaml b/helm/tenant/templates/kes-configuration-secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: kes-configuration
+  namespace: {{ template "minio-operator.namespace" $ }}
 type: Opaque
 stringData:
   server-config.yaml: {{ .Values.tenant.kes.configuration | toYaml | indent 2 }}

diff --git a/helm/tenant/templates/tenant-configuration.yaml b/helm/tenant/templates/tenant-configuration.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ dig "secrets" "name" "" (.Values | merge (dict)) }}
+  namespace: {{ template "minio-operator.namespace" $ }}
 type: Opaque
 stringData:
   config.env: |-

diff --git a/helm/tenant/templates/tenant.yaml b/helm/tenant/templates/tenant.yaml
@@ -3,6 +3,7 @@ apiVersion: minio.min.io/v2
 kind: Tenant
 metadata:
   name: {{ .name }}
+  namespace: {{ template "minio-operator.namespace" $ }}
   ## Optionally pass labels to be applied to the statefulset pods
   labels:
     app: minio

diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml
@@ -1,3 +1,5 @@
+# Override the tenant namespace
+namespaceOverride: ""
 ## Secret with default environment variable configurations to be used by MinIO Tenant.
 ## Not recommended for production deployments! Create the secret manually instead.
 secrets: