chart: Add Helm standard labels to templates

Signed-off-by: Michael William Le Nguyen <michael@mail.ttp.codes>
This commit is contained in:
Michael William Le Nguyen 2020-07-08 16:56:34 -07:00 committed by Sheng Yang
parent b478c3a1bf
commit ce6db0b2bc
15 changed files with 38 additions and 16 deletions

View File

@ -25,3 +25,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- define "secret" }} {{- define "secret" }}
{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.privateRegistry.registryUrl (printf "%s:%s" .Values.privateRegistry.registryUser .Values.privateRegistry.registryPasswd | b64enc) | b64enc }} {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.privateRegistry.registryUrl (printf "%s:%s" .Values.privateRegistry.registryUser .Values.privateRegistry.registryPasswd | b64enc) | b64enc }}
{{- end }} {{- 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 -}}

View File

@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: longhorn-role name: longhorn-role
labels: {{- include "longhorn.labels" . | nindent 4 }}
rules: rules:
- apiGroups: - apiGroups:
- apiextensions.k8s.io - apiextensions.k8s.io

View File

@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: longhorn-bind name: longhorn-bind
labels: {{- include "longhorn.labels" . | nindent 4 }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole

View File

@ -1,7 +1,7 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: Engine longhorn-manager: Engine
name: engines.longhorn.io name: engines.longhorn.io
spec: spec:
@ -21,7 +21,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: Replica longhorn-manager: Replica
name: replicas.longhorn.io name: replicas.longhorn.io
spec: spec:
@ -41,7 +41,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: Setting longhorn-manager: Setting
name: settings.longhorn.io name: settings.longhorn.io
spec: spec:
@ -59,7 +59,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: Volume longhorn-manager: Volume
name: volumes.longhorn.io name: volumes.longhorn.io
spec: spec:
@ -79,7 +79,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: EngineImage longhorn-manager: EngineImage
name: engineimages.longhorn.io name: engineimages.longhorn.io
spec: spec:
@ -99,7 +99,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: Node longhorn-manager: Node
name: nodes.longhorn.io name: nodes.longhorn.io
spec: spec:
@ -119,7 +119,7 @@ spec:
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: InstanceManager longhorn-manager: InstanceManager
name: instancemanagers.longhorn.io name: instancemanagers.longhorn.io
spec: spec:

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn-manager app: longhorn-manager
name: longhorn-manager name: longhorn-manager
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
@ -11,7 +11,7 @@ spec:
app: longhorn-manager app: longhorn-manager
template: template:
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 8 }}
app: longhorn-manager app: longhorn-manager
spec: spec:
containers: containers:
@ -93,7 +93,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn-manager app: longhorn-manager
name: longhorn-backend name: longhorn-backend
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}

View File

@ -3,6 +3,7 @@ kind: ConfigMap
metadata: metadata:
name: longhorn-default-setting name: longhorn-default-setting
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
data: data:
default-setting.yaml: |- default-setting.yaml: |-
backup-target: {{ .Values.defaultSettings.backupTarget }} backup-target: {{ .Values.defaultSettings.backupTarget }}

View File

@ -3,6 +3,7 @@ kind: Deployment
metadata: metadata:
name: longhorn-driver-deployer name: longhorn-driver-deployer
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@ -10,7 +11,7 @@ spec:
app: longhorn-driver-deployer app: longhorn-driver-deployer
template: template:
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 8 }}
app: longhorn-driver-deployer app: longhorn-driver-deployer
spec: spec:
initContainers: initContainers:

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn-ui app: longhorn-ui
name: longhorn-ui name: longhorn-ui
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
@ -12,7 +12,7 @@ spec:
app: longhorn-ui app: longhorn-ui
template: template:
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 8 }}
app: longhorn-ui app: longhorn-ui
spec: spec:
containers: containers:
@ -35,7 +35,7 @@ spec:
kind: Service kind: Service
apiVersion: v1 apiVersion: v1
metadata: metadata:
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn-ui app: longhorn-ui
{{- if eq .Values.service.ui.type "Rancher-Proxy" }} {{- if eq .Values.service.ui.type "Rancher-Proxy" }}
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"

View File

@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: longhorn-ingress name: longhorn-ingress
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn-ingress app: longhorn-ingress
annotations: annotations:
{{- if .Values.ingress.tls }} {{- if .Values.ingress.tls }}

View File

@ -6,12 +6,14 @@ metadata:
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
name: longhorn-post-upgrade name: longhorn-post-upgrade
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
spec: spec:
activeDeadlineSeconds: 900 activeDeadlineSeconds: 900
backoffLimit: 1 backoffLimit: 1
template: template:
metadata: metadata:
name: longhorn-post-upgrade name: longhorn-post-upgrade
labels: {{- include "longhorn.labels" . | nindent 8 }}
spec: spec:
containers: containers:
- name: longhorn-post-upgrade - name: longhorn-post-upgrade

View File

@ -3,6 +3,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ .Values.defaultSettings.registrySecret }} name: {{ .Values.defaultSettings.registrySecret }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
type: kubernetes.io/dockerconfigjson type: kubernetes.io/dockerconfigjson
data: data:
.dockerconfigjson: {{ template "secret" . }} .dockerconfigjson: {{ template "secret" . }}

View File

@ -3,3 +3,4 @@ kind: ServiceAccount
metadata: metadata:
name: longhorn-service-account name: longhorn-service-account
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: {{- include "longhorn.labels" . | nindent 4 }}

View File

@ -9,6 +9,7 @@ metadata:
annotations: annotations:
storageclass.beta.kubernetes.io/is-default-class: "false" storageclass.beta.kubernetes.io/is-default-class: "false"
{{- end }} {{- end }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
provisioner: driver.longhorn.io provisioner: driver.longhorn.io
allowVolumeExpansion: true allowVolumeExpansion: true
parameters: parameters:

View File

@ -4,7 +4,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: longhorn name: longhorn
labels: labels: {{- include "longhorn.labels" . | nindent 4 }}
app: longhorn app: longhorn
type: kubernetes.io/tls type: kubernetes.io/tls
data: data:

View File

@ -6,12 +6,14 @@ metadata:
"helm.sh/hook-delete-policy": hook-succeeded "helm.sh/hook-delete-policy": hook-succeeded
name: longhorn-uninstall name: longhorn-uninstall
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: {{- include "longhorn.labels" . | nindent 4 }}
spec: spec:
activeDeadlineSeconds: 900 activeDeadlineSeconds: 900
backoffLimit: 1 backoffLimit: 1
template: template:
metadata: metadata:
name: longhorn-uninstall name: longhorn-uninstall
labels: {{- include "longhorn.labels" . | nindent 8 }}
spec: spec:
containers: containers:
- name: longhorn-uninstall - name: longhorn-uninstall