implement helm best practices. add recommended standard helm labels. …

…move crds from templates/ to crds/
kubernetes-sigs · Aug 7, 2020 · ff88924 · ff88924
1 parent ac02684
commit ff88924
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...e.csi.x-k8s.io_secretproviderclasses.yaml → ...e.csi.x-k8s.io_secretproviderclasses.yaml b/...e.csi.x-k8s.io_secretproviderclasses.yaml → ...e.csi.x-k8s.io_secretproviderclasses.yaml
diff --git a/...8s.io_secretproviderclasspodstatuses.yaml → ...8s.io_secretproviderclasspodstatuses.yaml b/...8s.io_secretproviderclasspodstatuses.yaml → ...8s.io_secretproviderclasspodstatuses.yaml
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/_helpers.tpl b/manifest_staging/charts/secrets-store-csi-driver/templates/_helpers.tpl
@@ -25,10 +25,10 @@ Standard labels for helm resources
 */}}
 {{- define "sscd.labels" -}}
 labels:
-  heritage: "{{ .Release.Service }}"
-  release: "{{ .Release.Name }}"
-  revision: "{{ .Release.Revision }}"
-  chart: "{{ .Chart.Name }}"
-  chartVersion: "{{ .Chart.Version }}"
+  app.kubernetes.io/instance: "{{ .Release.Name }}"
+  app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+  app.kubernetes.io/name: "{{ template "sscd.name" . }}"
+  app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
   app: {{ template "sscd.name" . }}
+  helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{- end -}}
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/crds.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/crds.yaml
@@ -0,0 +1,8 @@
+# Helm 3 stores CRDS in chart/crds directory.
+# This purpose of this template is of maintain
+# compatibility with previous chart versions and Helm v2 users.
+
+{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
+  {{ $.Files.Get $path }}
+---
+{{- end }}