From fec6f5062ed44d1628202dbd586f0903812c2ccd Mon Sep 17 00:00:00 2001
From: mengkzhaoyun <mengkzhaoyun@gmail.com>
Date: Wed, 4 Nov 2020 18:29:05 +0800
Subject: [PATCH] update

---
 values-aliyun.yaml | 117 +++++++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/values-aliyun.yaml b/values-aliyun.yaml
index 4a51501..1aafa2b 100644
--- a/values-aliyun.yaml
+++ b/values-aliyun.yaml
@@ -12,10 +12,47 @@ expose:
 externalURL: https://hub.wodcloud.local
 
 persistence:
-  enabled: false
+  enabled: true
+  persistentVolumeClaim:
+    registry:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 5Gi
+    chartmuseum:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 5Gi
+    jobservice:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 1Gi
+    database:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 1Gi
+    redis:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 1Gi
+    trivy:
+      existingClaim: ""
+      storageClass: ""
+      subPath: ""
+      accessMode: ReadWriteOnce
+      size: 5Gi  
   imageChartStorage:
     # s3 , filesystem
-    type: s3
+    type: filesystem
     s3:
       accesskey: AKIAIOSFODNN7EXAMPLE
       secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
@@ -27,7 +64,6 @@ persistence:
       chunksize: '5242880'
       rootdirectory: /      
 
-
 imagePullPolicy: IfNotPresent
 
 logLevel: info
@@ -37,22 +73,17 @@ secretKey: "IpTIscRIgmerlare"
 portal:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
-    tag: v1.8.6
-  replicas: 1
+    tag: v2.1.1
 
 core:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
-    tag: v1.8.6
-  replicas: 1
+    tag: v2.1.1
 
 jobservice:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
-    tag: v1.8.6
-  replicas: 1
-  maxJobWorkers: 10
-  jobLogger: file
+    tag: v2.1.1
 
 registry:
   registry:
@@ -64,35 +95,15 @@ registry:
         memory: 4Gi
       requests:
         memory: 256Mi
-  nodeSelector:
-    harbor: enabled  
-  storageSpec:
-    # type: emptyDir , hostPath , volumeClaimTemplate
-    type: hostPath
-    emptyDir: {}
-    hostPath:
-      root: /data
-    volumeClaimTemplate:
-      spec:
-        storageClassName: rook-ceph-block
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 100Gi
-      selector: {}    
-
   controller:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
-      tag: v1.8.6
-  replicas: 1
+      tag: v2.1.1
 
 chartmuseum:
-  enabled: true
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
-    tag: v0.9.0-v1.8.6
-  replicas: 1
+    tag: v2.1.1
   nodeSelector:
     harbor: enabled  
   storageSpec:
@@ -102,52 +113,42 @@ chartmuseum:
       root: /data    
 
 clair:
-  enabled: true
+  clair:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
+      tag: v2.1.1
+  adapter:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/clair-adapter-photon
+      tag: v2.1.1
+
+trivy:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
-    tag: v2.1.0-v1.8.6
-  replicas: 1
+    repository: registry.cn-qingdao.aliyuncs.com/wod/trivy-adapter-photon
+    tag: v2.1.1
 
 notary:
-  enabled: true
   server:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
-      tag: v0.6.1-v1.8.6
-    replicas: 1
+      tag: v2.1.1
   signer:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
-      tag: v0.6.1-v1.8.6
-    replicas: 1
+      tag: v2.1.1
 
 database:
   type: internal
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
-      tag: v1.8.6
+      tag: v2.1.1
     password: "spaceIN511"
     resources:
       limits:
         memory: 4Gi
       requests:
         memory: 256Mi
-    nodeSelector:
-      harbor: enabled
-    storageSpec:
-      type: hostPath
-      emptyDir: {}
-      hostPath:
-        root: /data         
-      volumeClaimTemplate:
-        spec:
-          storageClassName: rook-ceph-block
-          accessModes: ["ReadWriteOnce"]
-          resources:
-            requests:
-              storage: 20Gi
-        selector: {}
 
 redis:
   type: internal
-- 
2.26.0