From 863dd331d0db2e449360c2916c904b0807b3cbbb Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 19 May 2020 12:16:22 +0100
Subject: [PATCH] Use common label for main chart

---
 charts/kubezero/Chart.yaml                   | 6 +++++-
 charts/kubezero/templates/app.yaml           | 5 +----
 charts/kubezero/templates/istio-service.yaml | 7 +------
 charts/kubezero/templates/project.yaml       | 5 +----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index e7979b29..3194bf9b 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform
 name: kubezero
-version: 0.2.5
+version: 0.2.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/logo_small.png
 keywords:
@@ -11,6 +11,10 @@ keywords:
 maintainers:
   - name: Quarky9
 dependencies:
+dependencies:
+  - name: kubezero-lib
+    version: ">= 0.1.1"
+    repository: https://zero-down-time.github.io/kubezero/
   - name: argo-cd
     version: 2.3.2
     repository: https://argoproj.github.io/argo-helm
diff --git a/charts/kubezero/templates/app.yaml b/charts/kubezero/templates/app.yaml
index 14e94b77..24b4a83a 100644
--- a/charts/kubezero/templates/app.yaml
+++ b/charts/kubezero/templates/app.yaml
@@ -4,10 +4,7 @@ metadata:
   name: kubezero
   namespace: argocd
   labels:
-    app.kubernetes.io/name: kubezero
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "kubezero-lib.labels" . | indent 4 }}
 spec:
   project: kubezero
   source:
diff --git a/charts/kubezero/templates/istio-service.yaml b/charts/kubezero/templates/istio-service.yaml
index e13e477d..195494ce 100644
--- a/charts/kubezero/templates/istio-service.yaml
+++ b/charts/kubezero/templates/istio-service.yaml
@@ -4,12 +4,7 @@ kind: VirtualService
 metadata:
   name: argocd-server
   labels:
-    app.kubernetes.io/name: {{ .Chart.Name }}-argocd-virtualservice
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/part-of: argocd
-    app.kubernetes.io/component: server
+{{ include "kubezero-lib.labels" . | indent 4 }}
 spec:
   gateways:
   - {{ .Values.istio.gateway }}
diff --git a/charts/kubezero/templates/project.yaml b/charts/kubezero/templates/project.yaml
index 5ab30ca8..81b0fcc3 100644
--- a/charts/kubezero/templates/project.yaml
+++ b/charts/kubezero/templates/project.yaml
@@ -4,10 +4,7 @@ metadata:
   name: kubezero
   namespace: argocd
   labels:
-    app.kubernetes.io/name: {{ .Chart.Name }}-project
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "kubezero-lib.labels" . | indent 4 }}
 spec:
   description: KubeZero - ZeroDownTime Kubernetes Platform