Merge pull request #560 from nlamirault/feat/labels

Refactoring Kubernetes labels and add custom labels

Author: k8s-ci-robot

charts/README.md

@@ -82,6 +82,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `image.csiResizer.tag`                                | csi-resizer docker image tag                          | `v1.3.0`                                                         |
 | `image.csiResizer.pullPolicy`                         | csi-resizer image pull policy                         | `IfNotPresent`                                                   |
 | `imagePullSecrets`                                    | Specify docker-registry secret names as an array      | [] (does not add image pull secrets to deployed pods)          |
+| `customLabels`                                        | Custom labels to add into metadata                    | `{}`                                                             |
 | `serviceAccount.create`                               | whether create service account of csi-blob-controller | `true`                                                           |
 | `serviceAccount.controller`                           | name of service account for csi-blob-controller       | `csi-blob-controller-sa`                                  |
 | `serviceAccount.node`                                 | name of service account for csi-blob-node             | `csi-blob-node-sa`                                        |

charts/latest/blob-csi-driver-v1.6.0.tgz

@@ -5,16 +5,39 @@
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/* labels for helm resources */}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "blob.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common selectors.
+*/}}
+{{- define "blob.selectorLabels" -}}
+app.kubernetes.io/name: {{ template "blob.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Common labels.
+*/}}
 {{- define "blob.labels" -}}
-labels:
-  app.kubernetes.io/instance: "{{ .Release.Name }}"
-  app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-  app.kubernetes.io/name: "{{ template "blob.name" . }}"
-  app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-  helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- include "blob.selectorLabels" . }}
+app.kubernetes.io/component: csi-driver
+app.kubernetes.io/part-of: {{ template "blob.name" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+helm.sh/chart: {{ template "blob.chart" . }}
+{{- if .Values.customLabels }}
+{{ toYaml .Values.customLabels }}
+{{- end }}
 {{- end -}}
 
+
 {{/* pull secrets for containers */}}
 {{- define "blob.pullSecrets" -}}
 {{- if .Values.imagePullSecrets }}

charts/latest/blob-csi-driver/templates/_helpers.tpl

@@ -4,6 +4,8 @@ kind: DaemonSet
 metadata:
   name: csi-blobfuse-proxy
   namespace: kube-system
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:

charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml

@@ -3,16 +3,20 @@ apiVersion: apps/v1
 metadata:
   name: {{ .Values.controller.name }}
   namespace: {{ .Release.Namespace }}
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    app: {{ .Values.controller.name }}
+    {{- include "blob.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controller.replicas }}
   selector:
     matchLabels:
       app: {{ .Values.controller.name }}
+      {{- include "blob.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-{{ include "blob.labels" . | indent 6 }}
+      labels:
         app: {{ .Values.controller.name }}
+        {{- include "blob.labels" . | nindent 8 }}
         {{- if .Values.podLabels }}
 {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}

charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

@@ -3,6 +3,8 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: {{ .Values.driver.name }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 spec:
   attachRequired: false
   podInfoOnMount: true

charts/latest/blob-csi-driver/templates/csi-blob-driver.yaml

@@ -3,7 +3,9 @@ apiVersion: apps/v1
 metadata:
   name: {{ .Values.node.name }}
   namespace: {{ .Release.Namespace }}
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    app: {{ .Values.node.name }}
+    {{- include "blob.labels" . | nindent 4 }}
 spec:
   updateStrategy:
     rollingUpdate:
@@ -12,10 +14,12 @@ spec:
   selector:
     matchLabels:
       app: {{ .Values.node.name }}
+      {{- include "blob.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-{{ include "blob.labels" . | indent 6 }}
+      labels:
         app: {{ .Values.node.name }}
+        {{- include "blob.labels" . | nindent 8 }}
         {{- if .Values.podLabels }}
 {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

@@ -3,7 +3,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.rbac.name }}-external-provisioner-role
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -33,7 +34,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.rbac.name }}-csi-provisioner-binding
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.controller }}
@@ -49,7 +51,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.rbac.name }}-external-resizer-role
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -71,7 +74,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ .Values.rbac.name }}-csi-resizer-role
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.controller }}
@@ -86,6 +90,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-{{ .Values.rbac.name }}-controller-secret-role
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
@@ -96,6 +102,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-{{ .Values.rbac.name }}-controller-secret-binding
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.controller }}

charts/latest/blob-csi-driver/templates/rbac-csi-blob-controller.yaml

@@ -4,6 +4,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-{{ .Values.rbac.name }}-node-secret-role
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
@@ -14,6 +16,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-{{ .Values.rbac.name }}-node-secret-binding
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.node }}

charts/latest/blob-csi-driver/templates/rbac-csi-blob-node.yaml

@@ -4,5 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.serviceAccount.controller }}
   namespace: {{ .Release.Namespace }}
-{{ include "blob.labels" . | indent 2 }}
+  labels:
+    {{- include "blob.labels" . | nindent 4 }}
 {{- end -}}