diff --git a/values-arm.yaml b/values-arm.yaml index 0bb165805f67d5a0cd46f2f2813313e8e9adc3a0..53994b58865b8a467c57712fee74676fd41451a4 100644 --- a/values-arm.yaml +++ b/values-arm.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 @@ -36,63 +72,38 @@ secretKey: "IpTIscRIgmerlare" portal: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-portal-arm64 + tag: v2.1.1 core: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-core-arm64 + tag: v2.1.1 jobservice: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice-arm64 - tag: v1.8.6 - replicas: 1 - maxJobWorkers: 10 - jobLogger: file + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-jobservice-arm64 + tag: v2.1.1 registry: registry: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry-arm64 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-registry-arm64 tag: 2.7.1 resources: limits: 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-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-registryctl-arm64 + tag: v2.1.1 chartmuseum: - enabled: true image: - repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-chartmuseum-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-chartmuseum-arm64 + 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/awecloud-clair-arm64 + tag: v2.1.1 + adapter: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-clair-adapter-arm64 + tag: v2.1.1 + +trivy: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-clair-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-trivy-adapter-arm64 + tag: v2.1.1 notary: - enabled: true server: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-server-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-notary-server-arm64 + tag: v2.1.1 signer: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-signer-arm64 - tag: v1.8.6 - replicas: 1 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-notary-signer-arm64 + tag: v2.1.1 database: type: internal internal: image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db-arm64 - tag: v1.8.6 + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-db-arm64 + 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