Merge branch 'dev' of cloud.wodcloud.com:market/harbor into dev

values-arm.yaml

@@ -72,24 +72,24 @@ secretKey: "IpTIscRIgmerlare"
 
 portal:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-portal-arm64
-    tag: v2.1.1
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
+    tag: v2.1.1-arm64
 
 core:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-core-arm64
-    tag: v2.1.1
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
+    tag: v2.1.1-arm64
 
 jobservice:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-jobservice-arm64
-    tag: v2.1.1
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
+    tag: v2.1.1-arm64
 
 registry:
   registry:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-registry-arm64
-      tag: 2.7.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/registry
+      tag: 2.7.1-arm64
     resources:
       limits:
         memory: 4Gi
@@ -97,15 +97,16 @@ registry:
         memory: 256Mi
   controller:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-registryctl-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
+      tag: v2.1.1-arm64
 
 chartmuseum:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-chartmuseum-arm64
-    tag: v2.1.1
-  nodeSelector:
-    harbor: enabled  
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum
+    tag: v2.1.1-arm64
+  nodeSelector: {}
+  # nodeSelector:
+  #   harbor: enabled
   storageSpec:
     type: hostPath
     emptyDir: {}
@@ -115,34 +116,34 @@ chartmuseum:
 clair:
   clair:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-clair-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair
+      tag: v2.1.1-arm64
   adapter:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-clair-adapter-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter
+      tag: v2.1.1-arm64
 
 trivy:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-trivy-adapter-arm64
-    tag: v2.1.1
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter
+    tag: v2.1.1-arm64
 
 notary:
   server:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-notary-server-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server
+      tag: v2.1.1-arm64
   signer:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-notary-signer-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer
+      tag: v2.1.1-arm64
 
 database:
   type: internal
   internal:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-db-arm64
-      tag: v2.1.1
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
+      tag: v2.1.1-arm64
     password: "spaceIN511"
     resources:
       limits:
@@ -155,4 +156,4 @@ redis:
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/redis
-      tag: 4.0.14-alpine
+      tag: 6.0.9-arm64
\ No newline at end of file