allow arbitrary labels to be set on operator and console resources (#…

…2069) * use console-labels on console resources * add operator labels to operator cluster role * allow arbitrary labels to be set on operator and console resources * only apply selector labels to deployments * fix syntax errors * Removed unused helpers * Simplified adding labels and only use selector labels where appropriate --------- Co-authored-by: Ramon de Klein <mail@ramondeklein.nl>
minio · Apr 22, 2024 · 01c56a5 · 01c56a5
1 parent fb6ceb8
commit 01c56a5
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 99 deletions.
diff --git a/helm/operator/templates/_helpers.tpl b/helm/operator/templates/_helpers.tpl
@@ -20,13 +20,6 @@ If release name contains chart name it will be used as a full name.
   {{- end -}}
 {{- end -}}
 
-{{/*
-Expand the name of the Operator Console.
-*/}}
-{{- define "minio-operator.console-name" -}}
-  {{- printf "%s-%s" .Chart.Name "console" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified console name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -48,11 +41,13 @@ Common labels for operator
 */}}
 {{- define "minio-operator.labels" -}}
 helm.sh/chart: {{ include "minio-operator.chart" . }}
-{{ include "minio-operator.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- range $key, $val :=  .Values.operator.additionalLabels }}
+{{ $key }}: {{ $val | quote }}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -68,15 +63,17 @@ Common labels for console
 */}}
 {{- define "minio-operator.console-labels" -}}
 helm.sh/chart: {{ include "minio-operator.chart" . }}
-{{ include "minio-operator.console-selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- range $key, $val := .Values.console.additionalLabels }}
+{{ $key }}: {{ $val | quote }}
+{{- end }}
 {{- end -}}
 
 {{/*
-Selector labels Operator
+Selector labels Console
 */}}
 {{- define "minio-operator.console-selectorLabels" -}}
 app.kubernetes.io/name: {{ include "minio-operator.name" . }}

diff --git a/helm/operator/templates/console-clusterrole.yaml b/helm/operator/templates/console-clusterrole.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: console-sa-role
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""

diff --git a/helm/operator/templates/console-clusterrolebinding.yaml b/helm/operator/templates/console-clusterrolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: console-sa-binding
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/helm/operator/templates/console-configmap.yaml b/helm/operator/templates/console-configmap.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   name: console-env
   namespace: {{ .Release.Namespace }}
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 data:
   CONSOLE_PORT: "9090"
   CONSOLE_TLS_PORT: "9443"

diff --git a/helm/operator/templates/console-deployment.yaml b/helm/operator/templates/console-deployment.yaml
@@ -4,14 +4,16 @@ kind: Deployment
 metadata:
   name: console
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "minio-operator.labels" . | nindent 4 }}
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.console.replicaCount }}
   selector:
     matchLabels: {{- include "minio-operator.console-selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{- include "minio-operator.console-selectorLabels" . | nindent 8 }}
+      labels:
+        {{- include "minio-operator.console-labels" . | nindent 8 }}
+        {{- include "minio-operator.console-selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.console.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}

diff --git a/helm/operator/templates/console-secret.yaml b/helm/operator/templates/console-secret.yaml
@@ -6,5 +6,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     kubernetes.io/service-account.name: console-sa
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 type: kubernetes.io/service-account-token
 {{- end }}
diff --git a/helm/operator/templates/console-service.yaml b/helm/operator/templates/console-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: console
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "minio-operator.labels" . | nindent 4 }}
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 spec:
   ports:
   - name: http

diff --git a/helm/operator/templates/console-serviceaccount.yaml b/helm/operator/templates/console-serviceaccount.yaml
@@ -4,4 +4,5 @@ kind: ServiceAccount
 metadata:
   name: console-sa
   namespace: {{ .Release.Namespace }}
+  labels: {{- include "minio-operator.console-labels" . | nindent 4 }}
 {{- end }}
diff --git a/helm/operator/templates/operator-clusterrole.yaml b/helm/operator/templates/operator-clusterrole.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: minio-operator-role
+  labels: {{- include "minio-operator.labels" . | nindent 4 }}
 rules:
   - apiGroups:
       - "apiextensions.k8s.io"

diff --git a/helm/operator/templates/operator-clusterrolebinding.yaml b/helm/operator/templates/operator-clusterrolebinding.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: minio-operator-binding
+  labels: {{- include "minio-operator.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/helm/operator/templates/operator-deployment.yaml b/helm/operator/templates/operator-deployment.yaml
@@ -10,7 +10,9 @@ spec:
     matchLabels: {{- include "minio-operator.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{- include "minio-operator.selectorLabels" . | nindent 8 }}
+      labels:
+        {{- include "minio-operator.labels" . | nindent 8 }}
+        {{- include "minio-operator.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.operator.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}

diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -32,6 +32,8 @@ operator:
       value: "off"
   # An array of additional annotations to be applied to the operator service account
   serviceAccountAnnotations: []
+  # additional labels to be applied to operator resources
+  additionalLabels: {}
   ###
   # Specify the Operator container image to use for the deployment.
   # ``image.tag``
@@ -177,6 +179,8 @@ console:
   #
   # If the Operator Console is disabled, all management of Operator Tenants must be done through the Kubernetes API.
   enabled: true
+  # additional labels to include for console resources
+  additionalLabels: {}
   ###
   # Specify the Operator Console container image to use for the deployment.
   # ``image.tag``

diff --git a/helm/tenant/templates/_helpers.tpl b/helm/tenant/templates/_helpers.tpl
@@ -1,89 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "minio-operator.name" -}}
-  {{- default .Chart.Name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "minio-operator.fullname" -}}
-  {{- $name := default .Chart.Name -}}
-  {{- if contains $name .Release.Name -}}
-    {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-  {{- else -}}
-    {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-Expand the name of the Operator Console.
-*/}}
-{{- define "minio-operator.console-name" -}}
-  {{- printf "%s-%s" .Chart.Name "console" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified console name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "minio-operator.console-fullname" -}}
-  {{- printf "%s-%s" .Release.Name "console" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "minio-operator.chart" -}}
-  {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels for operator
-*/}}
-{{- define "minio-operator.labels" -}}
-helm.sh/chart: {{ include "minio-operator.chart" . }}
-{{ include "minio-operator.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels Operator
-*/}}
-{{- define "minio-operator.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "minio-operator.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Common labels for console
-*/}}
-{{- define "minio-operator.console-labels" -}}
-helm.sh/chart: {{ include "minio-operator.chart" . }}
-{{ include "minio-operator.console-selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels Operator
-*/}}
-{{- define "minio-operator.console-selectorLabels" -}}
-app.kubernetes.io/name: {{ include "minio-operator.name" . }}
-app.kubernetes.io/instance: {{ printf "%s-%s" .Release.Name "console" }}
-{{- end -}}
-
-
 {{/*
 Renders a value that contains template.
 Usage: