From 051b2d650290b28104b214a2d127ea741f870ecb Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@spacesystech.com>
Date: Wed, 14 Nov 2018 01:35:34 +0800
Subject: [PATCH] update

---
 readme.md                           |  6 ++---
 templates/database/statefulset.yaml |  5 ++++-
 values.yaml                         | 34 ++++++++++++++---------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/readme.md b/readme.md
index d432dbb..b40f970 100644
--- a/readme.md
+++ b/readme.md
@@ -76,12 +76,12 @@ database:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
       tag: v1.6.0
-    password: "spaceIN511"
+    password: "passwd"
     volumes:
       data:
         storageClass: "storageos"
         accessMode: ReadWriteOnce
-        size: 1Gi
+        size: 5Gi
 
 registry:
   image:
@@ -187,7 +187,7 @@ database:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
       tag: v1.6.0
-    password: "spaceIN511"
+    password: "passwd"
     nodeSelector:
       harbor-database: enabled
 
diff --git a/templates/database/statefulset.yaml b/templates/database/statefulset.yaml
index 73c3777..8a93f8c 100644
--- a/templates/database/statefulset.yaml
+++ b/templates/database/statefulset.yaml
@@ -24,7 +24,10 @@ spec:
       initContainers:
       - name: "remove-lost-found"
         image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
-        command: ["rm", "-Rf", "/var/lib/postgresql/data/lost+found"]
+        command: 
+        - /bin/sh
+        - "-c"
+        - "rm -Rf /var/lib/postgresql/data/lost+found"
         volumeMounts:
         - name: data
           mountPath: /var/lib/postgresql/data
diff --git a/values.yaml b/values.yaml
index 1d5d142..f1956e3 100644
--- a/values.yaml
+++ b/values.yaml
@@ -2,11 +2,11 @@ persistence:
   enabled: true
 externalProtocol: https
 # The FQDN for Harbor service
-externalDomain: harbor.wodcloud.com
+externalDomain: hub.wodcloud.local
 # The Port for Harbor service, leave empty if the service 
 # is to be bound to port 80/443
 externalPort: 
-harborAdminPassword: "58772015"
+harborAdminPassword: "passwd"
 authenticationMode: "db_auth"
 selfRegistration: "on"
 ldap:
@@ -51,7 +51,7 @@ harborImageTag: &harbor_image_tag dev
 
 adminserver:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   volumes:
@@ -69,7 +69,7 @@ adminserver:
 
 jobservice:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   secret: "BBRQwySksiHZqJUh"
@@ -84,7 +84,7 @@ jobservice:
 
 ui:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   secret: "BBRQwySksiHZqJUh"
@@ -98,7 +98,7 @@ ui:
 
 busybox:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/busybox
+    repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
     tag: 1.29
 
 # TODO: change the style to be same with redis
@@ -108,16 +108,16 @@ database:
   type: internal
   internal:
     image:
-      repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
       tag: *harbor_image_tag
       pullPolicy: IfNotPresent
     # the superuser password of database
-    password: "spaceIN511"
+    password: "passwd"
     volumes:
       data:
         storageClass: "storageos"
         accessMode: ReadWriteOnce
-        size: 1Gi
+        size: 5Gi
     # resources:
     #  requests:
     #    memory: 256Mi
@@ -137,7 +137,7 @@ database:
 
 registry:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/registry-photon
+    repository: registry.cn-qingdao.aliyuncs.com/wod/registry-photon
     tag: dev
     pullPolicy: IfNotPresent
   httpSecret: "BBRQwySksiHZqJUh"
@@ -223,7 +223,7 @@ registry:
 chartmuseum:
   enabled: true
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
+    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
     tag: dev
     pullPolicy: IfNotPresent
   volumes:
@@ -242,7 +242,7 @@ chartmuseum:
 clair:
   enabled: true
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon
+    repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
     tag: dev
     pullPolicy: IfNotPresent
   volumes:
@@ -260,14 +260,14 @@ clair:
 
 redis:
   image:
-    repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/redis
+    repository: registry.cn-qingdao.aliyuncs.com/wod/redis
     tag: 4.0.1-alpine
     pullPolicy: IfNotPresent
   # if external Redis is used, set "external.enabled" to "true"
   # and fill the connection informations in "external" section.
   # or the internal Redis will be used
   usePassword: false
-  password: "spaceIN511"
+  password: "passwd"
   cluster:
     enabled: false
   master:
@@ -281,18 +281,18 @@ redis:
     port: "6379"
     databaseIndex: "0"
     usePassword: false
-    password: "spaceIN511"
+    password: "passwd"
 
 notary:
   enabled: true
   server:
     image:
-      repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
       tag: dev
       pullPolicy: IfNotPresent
   signer:
     image:
-      repository: registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
       tag: dev
       pullPolicy: IfNotPresent
     env:
-- 
2.26.0