diff --git a/docker/helm/templates/kyuubi-configmap.yaml b/docker/helm/templates/kyuubi-configmap.yaml index dfe064cad..1fedbfdc8 100644 --- a/docker/helm/templates/kyuubi-configmap.yaml +++ b/docker/helm/templates/kyuubi-configmap.yaml @@ -20,7 +20,11 @@ kind: ConfigMap metadata: name: {{ .Release.Name }}-kyuubi-defaults labels: - app: {{ template "kyuubi.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: kyuubi-defaults.conf: | # diff --git a/docker/helm/templates/kyuubi-deployment.yaml b/docker/helm/templates/kyuubi-deployment.yaml index 3dbdc06e3..a3b8c7485 100644 --- a/docker/helm/templates/kyuubi-deployment.yaml +++ b/docker/helm/templates/kyuubi-deployment.yaml @@ -20,20 +20,22 @@ kind: Deployment metadata: name: {{ .Release.Name }} labels: - app: {{ template "kyuubi.name" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app: {{ template "kyuubi.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: - app: {{ template "kyuubi.name" . }} - release: {{ .Release.Name }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} diff --git a/docker/helm/templates/kyuubi-role.yaml b/docker/helm/templates/kyuubi-role.yaml index 203a41cd9..fcb5a9f6e 100644 --- a/docker/helm/templates/kyuubi-role.yaml +++ b/docker/helm/templates/kyuubi-role.yaml @@ -21,6 +21,10 @@ kind: Role metadata: name: {{ .Release.Name }} labels: - app: {{ template "kyuubi.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} rules: {{- toYaml .Values.rbac.rules | nindent 2 }} {{- end }} diff --git a/docker/helm/templates/kyuubi-rolebinding.yaml b/docker/helm/templates/kyuubi-rolebinding.yaml index 26f395f30..8f74efc2d 100644 --- a/docker/helm/templates/kyuubi-rolebinding.yaml +++ b/docker/helm/templates/kyuubi-rolebinding.yaml @@ -21,7 +21,11 @@ kind: RoleBinding metadata: name: {{ .Release.Name }} labels: - app: {{ template "kyuubi.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} subjects: - kind: ServiceAccount name: {{ .Values.serviceAccount.name | default .Release.Name }} diff --git a/docker/helm/templates/kyuubi-service.yaml b/docker/helm/templates/kyuubi-service.yaml index 860477496..0152bd23d 100644 --- a/docker/helm/templates/kyuubi-service.yaml +++ b/docker/helm/templates/kyuubi-service.yaml @@ -20,7 +20,11 @@ kind: Service metadata: name: {{ .Release.Name }} labels: - app: {{ template "kyuubi.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- with .Values.service.annotations }} annotations: {{- toYaml . | nindent 4 }} @@ -33,5 +37,5 @@ spec: protocol: TCP type: {{ .Values.service.type }} selector: - app: {{ template "kyuubi.name" . }} - release: {{ .Release.Name }} \ No newline at end of file + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/docker/helm/templates/kyuubi-serviceaccount.yaml b/docker/helm/templates/kyuubi-serviceaccount.yaml index 56f5ff5a1..770d50136 100644 --- a/docker/helm/templates/kyuubi-serviceaccount.yaml +++ b/docker/helm/templates/kyuubi-serviceaccount.yaml @@ -21,5 +21,9 @@ kind: ServiceAccount metadata: name: {{ .Values.serviceAccount.name | default .Release.Name }} labels: - app: {{ template "kyuubi.name" . }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }} + app.kubernetes.io/name: {{ .Chart.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }}