Merge pull request #280 from inteon/uniformize_labels

Helm Uniformize label options
cert-manager · Feb 26, 2024 · 589d090 · 589d090
2 parents 029dd30 + 6fb2b21
commit 589d090
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 11 deletions.
diff --git a/deploy/charts/istio-csr/README.md b/deploy/charts/istio-csr/README.md
@@ -426,5 +426,12 @@ tolerations:
 > ```yaml
 > {}
 > ```
+#### **commonLabels** ~ `object`
+> Default value:
+> ```yaml
+> {}
+> ```
+
+Labels to apply to all resources
 
 <!-- /AUTO-GENERATED -->
diff --git a/deploy/charts/istio-csr/templates/_helpers.tpl b/deploy/charts/istio-csr/templates/_helpers.tpl
@@ -24,6 +24,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.commonLabels }}
+{{ toYaml .Values.commonLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/deploy/charts/istio-csr/templates/certificate.yaml b/deploy/charts/istio-csr/templates/certificate.yaml
@@ -4,6 +4,8 @@ kind: Certificate
 metadata:
   name: istiod
   namespace: {{ .Values.app.istio.namespace }}
+  labels:
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 {{- if .Values.app.certmanager.additionalAnnotations }}
   annotations:
     {{- range $annotation := .Values.app.certmanager.additionalAnnotations }}

diff --git a/deploy/charts/istio-csr/templates/clusterrole.yaml b/deploy/charts/istio-csr/templates/clusterrole.yaml
@@ -2,7 +2,7 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
   name: {{ include "cert-manager-istio-csr.name" . }}
 rules:
 - apiGroups:

diff --git a/deploy/charts/istio-csr/templates/clusterrolebinding.yaml b/deploy/charts/istio-csr/templates/clusterrolebinding.yaml
@@ -2,7 +2,7 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
   name: {{ include "cert-manager-istio-csr.name" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/deploy/charts/istio-csr/templates/deployment.yaml b/deploy/charts/istio-csr/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-istio-csr.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -14,6 +14,7 @@ spec:
     metadata:
       labels:
         app: {{ include "cert-manager-istio-csr.name" . }}
+        {{- include "cert-manager-istio-csr.labels" . | nindent 8 }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/deploy/charts/istio-csr/templates/metrics-service.yaml b/deploy/charts/istio-csr/templates/metrics-service.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-istio-csr.name" . }}-metrics
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.app.metrics.service.type }}
   ports:

diff --git a/deploy/charts/istio-csr/templates/metrics-servicemonitor.yaml b/deploy/charts/istio-csr/templates/metrics-servicemonitor.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-istio-csr.name" . }}
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
     prometheus: {{ .Values.app.metrics.service.servicemonitor.prometheusInstance }}
 {{- if .Values.app.metrics.service.servicemonitor.labels }}
 {{ toYaml .Values.app.metrics.service.servicemonitor.labels | indent 4}}

diff --git a/deploy/charts/istio-csr/templates/role.yaml b/deploy/charts/istio-csr/templates/role.yaml
@@ -2,7 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
   name: {{ include "cert-manager-istio-csr.name" . }}
   namespace: {{ .Values.app.certmanager.namespace }}
 rules:

diff --git a/deploy/charts/istio-csr/templates/role_leases.yaml b/deploy/charts/istio-csr/templates/role_leases.yaml
@@ -2,7 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
   name: {{ include "cert-manager-istio-csr.name" . }}-leases
   namespace: {{ .Values.app.controller.leaderElectionNamespace }}
 rules:

diff --git a/deploy/charts/istio-csr/templates/rolebinding.yaml b/deploy/charts/istio-csr/templates/rolebinding.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-istio-csr.name" . }}
   namespace: {{ .Values.app.certmanager.namespace }}
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/deploy/charts/istio-csr/templates/rolebinding_leases.yaml b/deploy/charts/istio-csr/templates/rolebinding_leases.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "cert-manager-istio-csr.name" . }}-leases
   namespace: {{ .Values.app.controller.leaderElectionNamespace }}
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/deploy/charts/istio-csr/templates/service.yaml b/deploy/charts/istio-csr/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-istio-csr.name" . }}
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/deploy/charts/istio-csr/templates/serviceaccount.yaml b/deploy/charts/istio-csr/templates/serviceaccount.yaml
@@ -6,6 +6,6 @@ imagePullSecrets:
 {{- end }}
 metadata:
   labels:
-{{ include "cert-manager-istio-csr.labels" . | indent 4 }}
+    {{- include "cert-manager-istio-csr.labels" . | nindent 4 }}
   name: {{ include "cert-manager-istio-csr.name" . }}
   namespace: {{ .Release.Namespace }}
diff --git a/deploy/charts/istio-csr/values.schema.json b/deploy/charts/istio-csr/values.schema.json
@@ -9,6 +9,9 @@
         "app": {
           "$ref": "#/$defs/helm-values.app"
         },
+        "commonLabels": {
+          "$ref": "#/$defs/helm-values.commonLabels"
+        },
         "image": {
           "$ref": "#/$defs/helm-values.image"
         },
@@ -444,6 +447,11 @@
       "description": "The Istio cluster's trust domain.",
       "type": "string"
     },
+    "helm-values.commonLabels": {
+      "default": {},
+      "description": "Labels to apply to all resources",
+      "type": "object"
+    },
     "helm-values.image": {
       "additionalProperties": false,
       "properties": {

diff --git a/deploy/charts/istio-csr/values.yaml b/deploy/charts/istio-csr/values.yaml
@@ -230,3 +230,6 @@ affinity: {}
 tolerations: []
 
 nodeSelector: {}
+
+# Labels to apply to all resources
+commonLabels: {}