diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 964b243..7ed4536 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -25,3 +25,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- define "secret" }} {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.privateRegistry.registryUrl (printf "%s:%s" .Values.privateRegistry.registryUser .Values.privateRegistry.registryPasswd | b64enc) | b64enc }} {{- end }} + +{{- /* +longhorn.labels generates the standard Helm labels. +*/ -}} +{{- define "longhorn.labels" -}} +app.kubernetes.io/name: {{ template "longhorn.name" . }} +helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/version: {{ .Chart.AppVersion }} +{{- end -}} diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml index 3b0a320..bc257e1 100644 --- a/chart/templates/clusterrole.yaml +++ b/chart/templates/clusterrole.yaml @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: longhorn-role + labels: {{- include "longhorn.labels" . | nindent 4 }} rules: - apiGroups: - apiextensions.k8s.io diff --git a/chart/templates/clusterrolebinding.yaml b/chart/templates/clusterrolebinding.yaml index 3a73990..30c7fa7 100644 --- a/chart/templates/clusterrolebinding.yaml +++ b/chart/templates/clusterrolebinding.yaml @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: longhorn-bind + labels: {{- include "longhorn.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/chart/templates/crds.yaml b/chart/templates/crds.yaml index e7ba471..8e4be3d 100644 --- a/chart/templates/crds.yaml +++ b/chart/templates/crds.yaml @@ -1,7 +1,7 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: Engine name: engines.longhorn.io spec: @@ -21,7 +21,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: Replica name: replicas.longhorn.io spec: @@ -41,7 +41,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: Setting name: settings.longhorn.io spec: @@ -59,7 +59,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: Volume name: volumes.longhorn.io spec: @@ -79,7 +79,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: EngineImage name: engineimages.longhorn.io spec: @@ -99,7 +99,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: Node name: nodes.longhorn.io spec: @@ -119,7 +119,7 @@ spec: apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} longhorn-manager: InstanceManager name: instancemanagers.longhorn.io spec: diff --git a/chart/templates/daemonset-sa.yaml b/chart/templates/daemonset-sa.yaml index f401b2f..ab79c97 100644 --- a/chart/templates/daemonset-sa.yaml +++ b/chart/templates/daemonset-sa.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn-manager name: longhorn-manager namespace: {{ .Release.Namespace }} @@ -11,7 +11,7 @@ spec: app: longhorn-manager template: metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 8 }} app: longhorn-manager spec: containers: @@ -93,7 +93,7 @@ spec: apiVersion: v1 kind: Service metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn-manager name: longhorn-backend namespace: {{ .Release.Namespace }} diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index a7efc75..8d4f2dd 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -3,6 +3,7 @@ kind: ConfigMap metadata: name: longhorn-default-setting namespace: {{ .Release.Namespace }} + labels: {{- include "longhorn.labels" . | nindent 4 }} data: default-setting.yaml: |- backup-target: {{ .Values.defaultSettings.backupTarget }} diff --git a/chart/templates/deployment-driver.yaml b/chart/templates/deployment-driver.yaml index 8b72188..b0f5529 100644 --- a/chart/templates/deployment-driver.yaml +++ b/chart/templates/deployment-driver.yaml @@ -3,6 +3,7 @@ kind: Deployment metadata: name: longhorn-driver-deployer namespace: {{ .Release.Namespace }} + labels: {{- include "longhorn.labels" . | nindent 4 }} spec: replicas: 1 selector: @@ -10,7 +11,7 @@ spec: app: longhorn-driver-deployer template: metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 8 }} app: longhorn-driver-deployer spec: initContainers: diff --git a/chart/templates/deployment-ui.yaml b/chart/templates/deployment-ui.yaml index 5133822..d24a8a1 100644 --- a/chart/templates/deployment-ui.yaml +++ b/chart/templates/deployment-ui.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn-ui name: longhorn-ui namespace: {{ .Release.Namespace }} @@ -12,7 +12,7 @@ spec: app: longhorn-ui template: metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 8 }} app: longhorn-ui spec: containers: @@ -35,7 +35,7 @@ spec: kind: Service apiVersion: v1 metadata: - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn-ui {{- if eq .Values.service.ui.type "Rancher-Proxy" }} kubernetes.io/cluster-service: "true" diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index b940c98..e3e9e3e 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: longhorn-ingress - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn-ingress annotations: {{- if .Values.ingress.tls }} diff --git a/chart/templates/postupgrade-job.yaml b/chart/templates/postupgrade-job.yaml index 5494aed..7a58eb8 100644 --- a/chart/templates/postupgrade-job.yaml +++ b/chart/templates/postupgrade-job.yaml @@ -6,12 +6,14 @@ metadata: "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation name: longhorn-post-upgrade namespace: {{ .Release.Namespace }} + labels: {{- include "longhorn.labels" . | nindent 4 }} spec: activeDeadlineSeconds: 900 backoffLimit: 1 template: metadata: name: longhorn-post-upgrade + labels: {{- include "longhorn.labels" . | nindent 8 }} spec: containers: - name: longhorn-post-upgrade diff --git a/chart/templates/registry-secret.yml b/chart/templates/registry-secret.yml index b327c87..eeb9a8f 100644 --- a/chart/templates/registry-secret.yml +++ b/chart/templates/registry-secret.yml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ .Values.defaultSettings.registrySecret }} + labels: {{- include "longhorn.labels" . | nindent 4 }} type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: {{ template "secret" . }} diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml index 0bbe9b0..a2280b4 100644 --- a/chart/templates/serviceaccount.yaml +++ b/chart/templates/serviceaccount.yaml @@ -3,3 +3,4 @@ kind: ServiceAccount metadata: name: longhorn-service-account namespace: {{ .Release.Namespace }} + labels: {{- include "longhorn.labels" . | nindent 4 }} diff --git a/chart/templates/storageclass.yaml b/chart/templates/storageclass.yaml index ab1f87b..73cc607 100644 --- a/chart/templates/storageclass.yaml +++ b/chart/templates/storageclass.yaml @@ -9,6 +9,7 @@ metadata: annotations: storageclass.beta.kubernetes.io/is-default-class: "false" {{- end }} + labels: {{- include "longhorn.labels" . | nindent 4 }} provisioner: driver.longhorn.io allowVolumeExpansion: true parameters: diff --git a/chart/templates/tls-secrets.yaml b/chart/templates/tls-secrets.yaml index 74d0645..7a75df0 100644 --- a/chart/templates/tls-secrets.yaml +++ b/chart/templates/tls-secrets.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Secret metadata: name: longhorn - labels: + labels: {{- include "longhorn.labels" . | nindent 4 }} app: longhorn type: kubernetes.io/tls data: diff --git a/chart/templates/uninstall-job.yaml b/chart/templates/uninstall-job.yaml index 43488d3..a30d04f 100644 --- a/chart/templates/uninstall-job.yaml +++ b/chart/templates/uninstall-job.yaml @@ -6,12 +6,14 @@ metadata: "helm.sh/hook-delete-policy": hook-succeeded name: longhorn-uninstall namespace: {{ .Release.Namespace }} + labels: {{- include "longhorn.labels" . | nindent 4 }} spec: activeDeadlineSeconds: 900 backoffLimit: 1 template: metadata: name: longhorn-uninstall + labels: {{- include "longhorn.labels" . | nindent 8 }} spec: containers: - name: longhorn-uninstall