Merge a76959657f into 534f4a9fb1

The deployment/statefulset and ingress already had the option to add custom labels to the relevant manifests; this commit extends this to the other resources for consistency:

- `service`, `consoleService`, `postJob` and `pvc` already supported custom annotations - added custom labels
- `serviceaccount` supported neither annotations nor labels - added both.

Fixes #21540

helm/minio/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: High Performance Object Storage
 name: minio
-version: 5.4.0
+version: 5.4.1
 appVersion: RELEASE.2024-12-18T13-15-44Z
 keywords:
   - minio

helm/minio/templates/console-service.yaml

@@ -8,8 +8,11 @@ metadata:
     chart: {{ template "minio.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.consoleService.annotations }}
-  annotations: {{- toYaml .Values.consoleService.annotations | nindent 4 }}
+    {{- with .Values.consoleService.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.consoleService.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.consoleService.type }}

helm/minio/templates/post-job.yaml

@@ -8,6 +8,9 @@ metadata:
     chart: {{ template "minio.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- with .Values.postJob.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation

helm/minio/templates/pvc.yaml

@@ -9,8 +9,11 @@ metadata:
     chart: {{ template "minio.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  {{- if .Values.persistence.annotations }}
-  annotations: {{- toYaml .Values.persistence.annotations | nindent 4 }}
+    {{- with .Values.persistence.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.persistence.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   accessModes:

helm/minio/templates/service.yaml

@@ -9,8 +9,12 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     monitoring: "true"
-  {{- if .Values.service.annotations }}
-  annotations: {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- with .Values.service.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   type: {{ .Values.service.type }}

helm/minio/templates/serviceaccount.yaml

@@ -3,4 +3,12 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.serviceAccount.name | quote }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.serviceAccount.labels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}

helm/minio/values.yaml

@@ -144,6 +144,7 @@ trustedCertsSecret: ""
 persistence:
   enabled: true
   annotations: {}
+  labels: {}
 
   ## A manually managed Persistent Volume and Claim
   ## Requires persistence.enabled: true
@@ -181,6 +182,7 @@ service:
   loadBalancerIP: ~
   externalIPs: []
   annotations: {}
+  labels: {}
 
   ## service.loadBalancerSourceRanges Addresses that are allowed when service is LoadBalancer
   ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
@@ -228,6 +230,7 @@ consoleService:
   loadBalancerIP: ~
   externalIPs: []
   annotations: {}
+  labels: {}
   ## consoleService.loadBalancerSourceRanges Addresses that are allowed when service is LoadBalancer
   ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
   ##
@@ -503,6 +506,7 @@ customCommandJob:
 postJob:
   podAnnotations: {}
   annotations: {}
+  labels: {}
   securityContext:
     enabled: false
     runAsUser: 1000
@@ -594,6 +598,10 @@ serviceAccount:
   ## The name of the service account to use. If 'create' is 'true', a service account with that name
   ## will be created.
   name: "minio-sa"
+  ## Annotations to add to the created service account
+  annotations: {}
+  ## Labels to add to the created service account
+  labels: {}
 
 metrics:
   serviceMonitor: