From 0f149efcd33d141b82f5cb936590fda13ee7c54c Mon Sep 17 00:00:00 2001 From: Marc CYPRIEN Date: Thu, 5 Mar 2026 15:45:03 +0100 Subject: [PATCH] Add a way to override Namespace for metabase chart --- charts/metabase/Chart.yaml | 2 +- charts/metabase/templates/_helpers.tpl | 7 ++++++- charts/metabase/templates/config.yaml | 2 +- charts/metabase/templates/database-secret.yaml | 2 +- charts/metabase/templates/deployment.yaml | 2 +- charts/metabase/templates/ingress.yaml | 4 ++-- charts/metabase/templates/pdb.yaml | 2 +- charts/metabase/templates/route.yaml | 2 +- charts/metabase/templates/securitygrouppolicy.yaml | 2 +- charts/metabase/templates/service.yaml | 4 ++-- charts/metabase/templates/serviceaccount.yaml | 2 +- charts/metabase/templates/servicemonitor.yaml | 2 +- charts/metabase/templates/ssl-secret.yaml | 2 +- charts/metabase/values.yaml | 3 ++- 14 files changed, 22 insertions(+), 16 deletions(-) diff --git a/charts/metabase/Chart.yaml b/charts/metabase/Chart.yaml index 27541be..61c2f8b 100644 --- a/charts/metabase/Chart.yaml +++ b/charts/metabase/Chart.yaml @@ -3,7 +3,7 @@ description: The easy, open source way for everyone in your company to ask questions and learn from data. name: metabase -version: 2.24.2 +version: 2.24.3 appVersion: v0.56.20.x maintainers: - name: pmint93 diff --git a/charts/metabase/templates/_helpers.tpl b/charts/metabase/templates/_helpers.tpl index 25951b2..08b7aa1 100644 --- a/charts/metabase/templates/_helpers.tpl +++ b/charts/metabase/templates/_helpers.tpl @@ -86,7 +86,12 @@ Create chart name and version as used by the chart label. {{/* Create the namespace name +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "metabase.namespace" -}} -{{- .Release.Namespace -}} +{{- if .Values.fullnamespaceOverride -}} +{{- .Values.fullnamespaceOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf .Release.Namespace | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{- end -}} diff --git a/charts/metabase/templates/config.yaml b/charts/metabase/templates/config.yaml index f2aae16..ceb2ab3 100644 --- a/charts/metabase/templates/config.yaml +++ b/charts/metabase/templates/config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "metabase.fullname" . }}-config - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/database-secret.yaml b/charts/metabase/templates/database-secret.yaml index 43eae56..8f34cb8 100644 --- a/charts/metabase/templates/database-secret.yaml +++ b/charts/metabase/templates/database-secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "metabase.fullname" . }}-database - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/deployment.yaml b/charts/metabase/templates/deployment.yaml index 17108ee..c841943 100644 --- a/charts/metabase/templates/deployment.yaml +++ b/charts/metabase/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/ingress.yaml b/charts/metabase/templates/ingress.yaml index 9c0b995..89f14ed 100644 --- a/charts/metabase/templates/ingress.yaml +++ b/charts/metabase/templates/ingress.yaml @@ -8,7 +8,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} @@ -47,7 +47,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/pdb.yaml b/charts/metabase/templates/pdb.yaml index 7fa6392..b7bf828 100644 --- a/charts/metabase/templates/pdb.yaml +++ b/charts/metabase/templates/pdb.yaml @@ -3,7 +3,7 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/route.yaml b/charts/metabase/templates/route.yaml index 0861f2e..b72ecd4 100644 --- a/charts/metabase/templates/route.yaml +++ b/charts/metabase/templates/route.yaml @@ -4,7 +4,7 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/securitygrouppolicy.yaml b/charts/metabase/templates/securitygrouppolicy.yaml index 15b1901..4acd6e1 100644 --- a/charts/metabase/templates/securitygrouppolicy.yaml +++ b/charts/metabase/templates/securitygrouppolicy.yaml @@ -3,7 +3,7 @@ apiVersion: vpcresources.k8s.aws/v1beta1 kind: SecurityGroupPolicy metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/service.yaml b/charts/metabase/templates/service.yaml index db74ceb..a36bd51 100644 --- a/charts/metabase/templates/service.yaml +++ b/charts/metabase/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} @@ -47,4 +47,4 @@ spec: {{- end }} selector: app: {{ template "metabase.name" . }} - release: {{ .Release.Name }} \ No newline at end of file + release: {{ .Release.Name }} diff --git a/charts/metabase/templates/serviceaccount.yaml b/charts/metabase/templates/serviceaccount.yaml index 4c3da80..22fd7bc 100644 --- a/charts/metabase/templates/serviceaccount.yaml +++ b/charts/metabase/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} metadata: name: {{ include "metabase.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/servicemonitor.yaml b/charts/metabase/templates/servicemonitor.yaml index bf6d002..934c488 100644 --- a/charts/metabase/templates/servicemonitor.yaml +++ b/charts/metabase/templates/servicemonitor.yaml @@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ template "metabase.fullname" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/templates/ssl-secret.yaml b/charts/metabase/templates/ssl-secret.yaml index 03b23f3..56b85b6 100644 --- a/charts/metabase/templates/ssl-secret.yaml +++ b/charts/metabase/templates/ssl-secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "metabase.fullname" . }}-ssl - namespace: {{ .Release.Namespace }} + namespace: {{ template "metabase.namespace" . }} labels: app: {{ template "metabase.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml index 5902434..708f1db 100644 --- a/charts/metabase/values.yaml +++ b/charts/metabase/values.yaml @@ -32,9 +32,10 @@ image: pullPolicy: IfNotPresent pullSecrets: [] -## String to fully override metabase.fullname template +## Strings to fully override metabase.fullname and metabase.namespace templates ## # fullnameOverride: +# fullnamespaceOverride: # Config Jetty web server listen: