From 676475b56d7fadf5b5f2d5ce5c9e998210df516b Mon Sep 17 00:00:00 2001
From: mengkzhaoyun <mengkzhaoyun@gmail.com>
Date: Fri, 19 Jul 2019 14:24:58 +0800
Subject: [PATCH] update

---
 Deploy.md                           | 9 ++++++++-
 templates/database/database-ss.yaml | 8 ++++----
 templates/registry/registry-ss.yaml | 2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Deploy.md b/Deploy.md
index 63fd771..e4739b8 100644
--- a/Deploy.md
+++ b/Deploy.md
@@ -20,6 +20,13 @@ helm delete harbor --purge
 # update
 helm upgrade harbor /etc/kubernetes/helm/harbor \
 -f /etc/kubernetes/helm/harbor/values-overrides.yaml
+
+# template
+helm template \
+/etc/kubernetes/helm/harbor \
+--name=harbor \
+--namespace=harbor \
+-f /etc/kubernetes/helm/harbor/values-overrides.yaml > /etc/kubernetes/helm/harbor/dist.yaml
 ```
 
 ## images
@@ -79,4 +86,4 @@ docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1
 docker pull goharbor/harbor-db:v1.7.5 && \
 docker tag goharbor/harbor-db:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.7.5 && \
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.7.5
-```
\ No newline at end of file
+```
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index 2158abf..be009e5 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -70,13 +70,13 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}          
       volumes:
-      - name: etc-localtime
-        hostPath:
-          path: /etc/localtime
+        - name: etc-localtime
+          hostPath:
+            path: /etc/localtime
       {{- if .Values.database.internal.storageSpec.hostPath }}
         - name: data
           hostPath:
-            path: {{.Values.database.internal.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
+            path: {{.Values.database.internal.storageSpec.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
       {{- else if .Values.database.internal.storageSpec.emptyDir }}
         - name: data
           emptyDir: {}      
diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml
index 3416471..e41e608 100644
--- a/templates/registry/registry-ss.yaml
+++ b/templates/registry/registry-ss.yaml
@@ -136,7 +136,7 @@ spec:
       {{- if .Values.registry.storageSpec.hostPath }}
       - name: data
         hostPath:
-          path: {{.Values.registry.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
+          path: {{.Values.registry.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/registry
       {{- else if .Values.registry.storageSpec.emptyDir }}
       - name: data
         emptyDir: {}      
-- 
2.26.0