From ff889247ad7b830a8f6077db650fdcd86a798a5d Mon Sep 17 00:00:00 2001
From: Sean Nguyen <sean.nguyen@rackspace.com>
Date: Fri, 7 Aug 2020 11:31:03 -0700
Subject: [PATCH] implement helm best practices. add recommended standard helm
 labels.  move crds from templates/ to crds/

---
 ...crets-store.csi.x-k8s.io_secretproviderclasses.yaml |  0
 ...re.csi.x-k8s.io_secretproviderclasspodstatuses.yaml |  0
 .../secrets-store-csi-driver/templates/_helpers.tpl    | 10 +++++-----
 .../secrets-store-csi-driver/templates/crds.yaml       |  8 ++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)
 rename manifest_staging/charts/secrets-store-csi-driver/{templates => crds}/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml (100%)
 rename manifest_staging/charts/secrets-store-csi-driver/{templates => crds}/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml (100%)
 create mode 100644 manifest_staging/charts/secrets-store-csi-driver/templates/crds.yaml

diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml
similarity index 100%
rename from manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml
rename to manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml
similarity index 100%
rename from manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml
rename to manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.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
index e7f3b1315..64510cad4 100644
--- 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
new file mode 100644
index 000000000..11116ad29
--- /dev/null
+++ 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 }}