From 9da96508689af1216b9117cd0ce64117ac1d89cc Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@spacesystech.com>
Date: Thu, 18 Oct 2018 18:43:55 +0800
Subject: [PATCH] update

---
 templates/adminserver/adminserver-ss.yaml | 2 ++
 templates/chartmuseum/chartmuseum-ss.yaml | 2 ++
 templates/clair/clair-dpl.yaml            | 6 ++----
 templates/database/database-ss.yaml       | 2 ++
 templates/notary/notary-server.yaml       | 6 ++----
 templates/notary/notary-signer.yaml       | 6 ++----
 templates/redis/redis.dp.yml              | 2 ++
 templates/registry/registry-ss.yaml       | 2 ++
 templates/ui/ui-dpl.yaml                  | 2 ++
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/templates/adminserver/adminserver-ss.yaml b/templates/adminserver/adminserver-ss.yaml
index 571eb45..878ab54 100644
--- a/templates/adminserver/adminserver-ss.yaml
+++ b/templates/adminserver/adminserver-ss.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-adminserver
+    version: {{ .Values.adminserver.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-adminserver"
@@ -17,6 +18,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-adminserver
+        version: {{ .Values.adminserver.image.tag }}
     spec:
       containers:
       - name: adminserver
diff --git a/templates/chartmuseum/chartmuseum-ss.yaml b/templates/chartmuseum/chartmuseum-ss.yaml
index 6f62e08..544f33b 100644
--- a/templates/chartmuseum/chartmuseum-ss.yaml
+++ b/templates/chartmuseum/chartmuseum-ss.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-chartmuseum
+    version: {{ .Values.chartmuseum.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-chartmuseum"
@@ -18,6 +19,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-chartmuseum
+        version: {{ .Values.chartmuseum.image.tag }}
     spec:
       containers:
       - name: chartmuseum
diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
index 19ebe30..7b79856 100644
--- a/templates/clair/clair-dpl.yaml
+++ b/templates/clair/clair-dpl.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-clair
+    version: {{ .Values.clair.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-clair
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-clair
+        version: {{ .Values.clair.image.tag }}
     spec:
       containers:
       - name: clair
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index 5b71ac8..15e8903 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-database
+    version: {{ .Values.busybox.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-database"
@@ -18,6 +19,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-database
+        version: {{ .Values.busybox.image.tag }}
     spec:
       initContainers:
       - name: "remove-lost-found"
diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml
index b0f2b07..53bca97 100644
--- a/templates/notary/notary-server.yaml
+++ b/templates/notary/notary-server.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-notary-server
+    version: {{ .Values.notary.server.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-notary-server
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-notary-server
+        version: {{ .Values.notary.server.image.tag }}
     spec:
       containers:
       - name: notary-server
diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml
index 1f2cc57..a4450aa 100644
--- a/templates/notary/notary-signer.yaml
+++ b/templates/notary/notary-signer.yaml
@@ -6,17 +6,15 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-notary-signer
+    version: {{ .Values.notary.signer.image.tag }}
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-{{ include "harbor.matchLabels" . | indent 6 }}
-      app: harbor-notary-signer
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-notary-signer
+        version: {{ .Values.notary.signer.image.tag }}
     spec:
       containers:
       - name: notary-signer
diff --git a/templates/redis/redis.dp.yml b/templates/redis/redis.dp.yml
index 5a172fe..0440eaf 100644
--- a/templates/redis/redis.dp.yml
+++ b/templates/redis/redis.dp.yml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-redis
+    version: {{ .Values.redis.image.tag }}
 spec:
   replicas: 1
   template:
@@ -13,6 +14,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-redis
+        version: {{ .Values.redis.image.tag }}
     spec:
       containers:
       - name: redis
diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml
index 63717e2..acb38d3 100644
--- a/templates/registry/registry-ss.yaml
+++ b/templates/registry/registry-ss.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-registry
+    version: {{ .Values.registry.image.tag }}
 spec:
   replicas: 1
   serviceName: "{{ template "harbor.fullname" . }}-registry"
@@ -17,6 +18,7 @@ spec:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         app: harbor-registry
+        version: {{ .Values.registry.image.tag }}
     spec:
       containers:
       - name: registry
diff --git a/templates/ui/ui-dpl.yaml b/templates/ui/ui-dpl.yaml
index 31ad36c..4fb0f0a 100644
--- a/templates/ui/ui-dpl.yaml
+++ b/templates/ui/ui-dpl.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
     app: harbor-ui
+    version: {{ .Values.ui.image.tag }}
 spec:
   replicas: 1
   template:
@@ -12,6 +13,7 @@ spec:
       labels:
 {{ include "harbor.matchLabels" . | indent 8 }}
         app: harbor-ui
+        version: {{ .Values.ui.image.tag }}
     spec:
       containers:
       - name: ui
-- 
2.26.0