From 76b61b54826fe0c4a15699e5078f4ccc9da82ff4 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 19 May 2020 11:28:38 +0100
Subject: [PATCH] Switch kiam to use helm lib

---
 charts/kubezero-kiam/Chart.yaml               |  5 ++++-
 .../kubezero-kiam/templates/postsync-ns.yaml  | 22 +++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml
index 2dceee64..c0c7d24f 100644
--- a/charts/kubezero-kiam/Chart.yaml
+++ b/charts/kubezero-kiam/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-kiam
 description: KubeZero Umbrella Chart for Kiam
 type: application
-version: 0.2.2
+version: 0.2.3
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/logo_small.png
 keywords:
@@ -11,6 +11,9 @@ keywords:
 maintainers:
   - name: Quarky9
 dependencies:
+  - name: kubezero-lib
+    version: ">= 0.1.1"
+    repository: https://zero-down-time.github.io/kubezero/
   - name: kiam
     version: 5.7.0
     repository: https://uswitch.github.io/kiam-helm-charts/charts/
diff --git a/charts/kubezero-kiam/templates/postsync-ns.yaml b/charts/kubezero-kiam/templates/postsync-ns.yaml
index 590279f8..8170b9e7 100644
--- a/charts/kubezero-kiam/templates/postsync-ns.yaml
+++ b/charts/kubezero-kiam/templates/postsync-ns.yaml
@@ -2,20 +2,14 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: kubezero
+{{ include "kubezero-lib.labels" . | indent 4 }}
   name: kiam-namespace-annotate
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: kubezero
+{{ include "kubezero-lib.labels" . | indent 4 }}
   name: kiam-namespace-annotate
 rules:
   - apiGroups:
@@ -32,10 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: kubezero
+{{ include "kubezero-lib.labels" . | indent 4 }}
   name: kiam-namespace-annotate
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -52,13 +43,10 @@ metadata:
   name: kiam-kube-system-ns-annotation
   namespace: kube-system
   annotations:
-    argocd.argoproj.io/hook: PostSync
+    argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/hook-delete-policy: HookSucceeded
   labels:
-    app.kubernetes.io/name: {{ .name }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: kubezero
+{{ include "kubezero-lib.labels" . | indent 4 }}
 spec:
   template:
     spec: