Skip to content

Commit f449a44

Browse files
opencmit2opencmit2
authoredDec 21, 2023
[bitnami/minio] Add namespaceOverride for Minio chart deployment (#21638)
1 parent 8f48778 commit f449a44

19 files changed

+26
-20
lines changed
 

‎bitnami/minio/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ maintainers:
3434
name: minio
3535
sources:
3636
- https://github.com/bitnami/charts/tree/main/bitnami/minio
37-
version: 12.11.0
37+
version: 12.12.0

‎bitnami/minio/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ The command removes all the Kubernetes components associated with the chart and
6767
| Name | Description | Value |
6868
| ------------------- | -------------------------------------------------------------------------------------------- | --------------- |
6969
| `nameOverride` | String to partially override common.names.fullname template (will maintain the release name) | `""` |
70+
| `namespaceOverride` | String to fully override common.names.namespace | `""` |
7071
| `fullnameOverride` | String to fully override common.names.fullname template | `""` |
7172
| `commonLabels` | Labels to add to all deployed objects | `{}` |
7273
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` |

‎bitnami/minio/templates/api-ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
88
kind: Ingress
99
metadata:
1010
name: {{ include "common.names.fullname" . }}-api
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list (include "minio.apiIngress.annotations" . | fromYaml) .Values.commonAnnotations ) "context" . ) }}
1414
{{- if $annotations }}

‎bitnami/minio/templates/distributed/headless-svc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v1
88
kind: Service
99
metadata:
1010
name: {{ printf "%s-headless" (include "common.names.fullname" .) | trunc 63 }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if or .Values.service.headless.annotations .Values.commonAnnotations }}
1414
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.service.headless.annotations .Values.commonAnnotations ) "context" . ) }}

‎bitnami/minio/templates/distributed/pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
88
kind: PodDisruptionBudget
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if .Values.commonAnnotations }}
1414
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

‎bitnami/minio/templates/distributed/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: APACHE-2.0
66
{{- if (eq .Values.mode "distributed") }}
77
{{- $fullname := include "common.names.fullname" . }}
88
{{- $headlessService := printf "%s-headless" (include "common.names.fullname" .) | trunc 63 }}
9-
{{- $releaseNamespace := .Release.Namespace }}
9+
{{- $releaseNamespace := include "common.names.namespace" . }}
1010
{{- $clusterDomain := .Values.clusterDomain }}
1111
{{- $apiPort := toString .Values.containerPorts.api }}
1212
{{- $replicaCount := int .Values.statefulset.replicaCount }}

‎bitnami/minio/templates/ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
88
kind: Ingress
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list (include "minio.ingress.annotations" . | fromYaml) .Values.commonAnnotations ) "context" . ) }}
1414
{{- if $annotations }}

‎bitnami/minio/templates/networkpolicy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kind: NetworkPolicy
88
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if .Values.commonAnnotations }}
1414
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

‎bitnami/minio/templates/prometheusrule.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

66
{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
7+
{{- $releaseNamespace := default (include "common.names.namespace" .) .Values.metrics.prometheusRule.namespace }}
78
apiVersion: monitoring.coreos.com/v1
89
kind: PrometheusRule
910
metadata:
1011
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }}
12+
namespace: {{ $releaseNamespace | quote }}
1213
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1314
app.kubernetes.io/component: metrics
1415
{{- if .Values.metrics.prometheusRule.additionalLabels }}

‎bitnami/minio/templates/provisioning-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apiVersion: v1
99
kind: ConfigMap
1010
metadata:
1111
name: {{ $fullname }}
12-
namespace: {{ .Release.Namespace | quote }}
12+
namespace: {{ include "common.names.namespace" . | quote }}
1313
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1414
app.kubernetes.io/component: minio-provisioning
1515
{{- if .Values.commonAnnotations }}

‎bitnami/minio/templates/provisioning-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: batch/v1
1010
kind: Job
1111
metadata:
1212
name: {{ $fullname }}
13-
namespace: {{ .Release.Namespace | quote }}
13+
namespace: {{ include "common.names.namespace" . | quote }}
1414
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1515
app.kubernetes.io/component: minio-provisioning
1616
annotations:

‎bitnami/minio/templates/pvc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kind: PersistentVolumeClaim
88
apiVersion: v1
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if or .Values.persistence.annotations .Values.commonAnnotations }}
1414
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.persistence.annotations .Values.commonAnnotations ) "context" . ) }}

‎bitnami/minio/templates/secrets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v1
88
kind: Secret
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if .Values.commonAnnotations }}
1414
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

‎bitnami/minio/templates/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apiVersion: v1
77
kind: Service
88
metadata:
99
name: {{ include "common.names.fullname" . }}
10-
namespace: {{ .Release.Namespace | quote }}
10+
namespace: {{ include "common.names.namespace" . | quote }}
1111
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1212
{{- if or .Values.service.annotations .Values.commonAnnotations }}
1313
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.service.annotations .Values.commonAnnotations ) "context" . ) }}

‎bitnami/minio/templates/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v1
88
kind: ServiceAccount
99
metadata:
1010
name: {{ template "minio.serviceAccountName" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
1414
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}

‎bitnami/minio/templates/servicemonitor.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

66
{{- if .Values.metrics.serviceMonitor.enabled }}
7+
{{- $releaseNamespace := default (include "common.names.namespace" .) .Values.metrics.prometheusRule.namespace }}
78
apiVersion: {{ default "monitoring.coreos.com/v1" .Values.metrics.serviceMonitor.apiVersion }}
89
kind: ServiceMonitor
910
metadata:
1011
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
12+
namespace: {{ $releaseNamespace | quote }}
1213
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
1314
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
1415
{{- if .Values.commonAnnotations }}
@@ -56,7 +57,7 @@ spec:
5657
{{- end }}
5758
namespaceSelector:
5859
matchNames:
59-
- {{ .Release.Namespace | quote }}
60+
- {{ include "common.names.namespace" . | quote }}
6061
selector:
6162
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 6 }}
6263
{{- if .Values.metrics.serviceMonitor.selector }}

‎bitnami/minio/templates/standalone/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
88
kind: Deployment
99
metadata:
1010
name: {{ include "common.names.fullname" . }}
11-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1212
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- if .Values.commonAnnotations }}
1414
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

‎bitnami/minio/templates/tls-secrets.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: v1
1010
kind: Secret
1111
metadata:
1212
name: {{ .name }}
13-
namespace: {{ $.Release.Namespace | quote }}
13+
namespace: {{ include "common.names.namespace" . | quote }}
1414
labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
1515
{{- if $.Values.commonAnnotations }}
1616
annotations: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }}
@@ -30,7 +30,7 @@ apiVersion: v1
3030
kind: Secret
3131
metadata:
3232
name: {{ $secretName }}
33-
namespace: {{ .Release.Namespace | quote }}
33+
namespace: {{ include "common.names.namespace" . | quote }}
3434
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
3535
{{- if .Values.commonAnnotations }}
3636
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
@@ -45,7 +45,7 @@ data:
4545
{{- if (include "minio.createTlsSecret" .) }}
4646
{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }}
4747
{{- $ca := genCA "minio-ca" 365 }}
48-
{{- $releaseNamespace := .Release.Namespace }}
48+
{{- $releaseNamespace := include "common.names.namespace" . }}
4949
{{- $clusterDomain := .Values.clusterDomain }}
5050
{{- $fullname := include "common.names.fullname" . }}
5151
{{- $serviceName := include "common.names.fullname" . }}

‎bitnami/minio/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ global:
2424
## @param nameOverride String to partially override common.names.fullname template (will maintain the release name)
2525
##
2626
nameOverride: ""
27+
## @param namespaceOverride String to fully override common.names.namespace
28+
##
29+
namespaceOverride: ""
2730
## @param fullnameOverride String to fully override common.names.fullname template
2831
##
2932
fullnameOverride: ""

0 commit comments

Comments
 (0)
Please sign in to comment.