Add checksum to deployments and statefulsets:

- Add checksum for deployments/statefulsets so they are redeployed if config change - Rename files to follow same naming Signed-off-by: Julio Chana <[email protected]>
goharbor · Nov 29, 2018 · 2adf20e · 2adf20e
1 parent e6068ee
commit 2adf20e
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 0 deletions.
diff --git a/templates/adminserver/adminserver-dpl.yaml b/templates/adminserver/adminserver-dpl.yaml
@@ -13,6 +13,9 @@ spec:
       component: adminserver
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/adminserver/adminserver-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/adminserver/adminserver-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: adminserver

diff --git a/...ates/adminserver/adminserver-secrets.yaml → ...lates/adminserver/adminserver-secret.yaml b/...ates/adminserver/adminserver-secrets.yaml → ...lates/adminserver/adminserver-secret.yaml
diff --git a/templates/chartmuseum/chartmuseum-dpl.yaml b/templates/chartmuseum/chartmuseum-dpl.yaml
@@ -14,6 +14,9 @@ spec:
       component: chartmuseum
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/chartmuseum/chartmuseum-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/chartmuseum/chartmuseum-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: chartmuseum

diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
@@ -14,6 +14,8 @@ spec:
       component: clair
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/clair/clair-cm.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: clair

diff --git a/templates/core/core-dpl.yaml b/templates/core/core-dpl.yaml
@@ -13,6 +13,9 @@ spec:
       component: core
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.matchLabels" . | indent 8 }}
         component: core

diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
@@ -16,6 +16,8 @@ spec:
       component: database
   template:
     metadata:
+      annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: database

diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
@@ -13,6 +13,9 @@ spec:
       component: jobservice
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: jobservice

diff --git a/templates/jobservice/jobservice-secrets.yaml → templates/jobservice/jobservice-secret.yaml b/templates/jobservice/jobservice-secrets.yaml → templates/jobservice/jobservice-secret.yaml
diff --git a/templates/nginx/configmap-http.yaml → templates/nginx/nginx-cm-http.yaml b/templates/nginx/configmap-http.yaml → templates/nginx/nginx-cm-http.yaml
diff --git a/templates/nginx/configmap-https.yaml → templates/nginx/nginx-cm-https.yaml b/templates/nginx/configmap-https.yaml → templates/nginx/nginx-cm-https.yaml
diff --git a/templates/nginx/deployment.yaml → templates/nginx/nginx-dpl.yaml b/templates/nginx/deployment.yaml → templates/nginx/nginx-dpl.yaml
@@ -14,6 +14,13 @@ spec:
       component: nginx
   template:
     metadata:
+      annotations:
+        {{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }}
+        checksum/configmap: {{ include (print $.Template.BasePath "/nginx/nginx-cm-http.yaml") . | sha256sum }}
+        {{- else if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }}
+        checksum/configmap: {{ include (print $.Template.BasePath "/nginx/nginx-cm-https.yaml") . | sha256sum }}
+        {{- end }}
+        checksum/secret: {{ include (print $.Template.BasePath "/nginx/nginx-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: nginx

diff --git a/templates/nginx/secret.yaml → templates/nginx/nginx-secret.yaml b/templates/nginx/secret.yaml → templates/nginx/nginx-secret.yaml
diff --git a/templates/nginx/service.yaml → templates/nginx/nginx-svc.yaml b/templates/nginx/service.yaml → templates/nginx/nginx-svc.yaml
diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml
@@ -14,6 +14,8 @@ spec:
       component: notary-server
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/notary/notary-cm.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: notary-server

diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml
@@ -14,6 +14,8 @@ spec:
       component: notary-signer
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/notary/notary-cm.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: notary-signer

diff --git a/templates/portal/deployment.yaml → templates/portal/portal-dpl.yaml b/templates/portal/deployment.yaml → templates/portal/portal-dpl.yaml
diff --git a/templates/portal/service.yaml → templates/portal/portal-svc.yaml b/templates/portal/service.yaml → templates/portal/portal-svc.yaml
diff --git a/templates/redis/statefulset.yaml → templates/redis/redis-ss.yaml b/templates/redis/statefulset.yaml → templates/redis/redis-ss.yaml
diff --git a/templates/redis/service.yaml → templates/redis/redis-svc.yaml b/templates/redis/service.yaml → templates/redis/redis-svc.yaml
diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
@@ -13,6 +13,9 @@ spec:
       component: registry
   template:
     metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }}
       labels:
 {{ include "harbor.labels" . | indent 8 }}
         component: registry