From 3785f76867cb7d0836d9b6535fec6efdff430d25 Mon Sep 17 00:00:00 2001 From: shucheng Date: Mon, 26 Oct 2020 21:22:18 +0800 Subject: [PATCH] v1.8.6 arm64 update --- Deploy.md | 97 +++++++++++++++++++--------- values-aliyun.yaml | 18 +++--- values-arm.yaml | 157 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+), 39 deletions(-) create mode 100644 values-arm.yaml diff --git a/Deploy.md b/Deploy.md index 794f80b..bafb99e 100644 --- a/Deploy.md +++ b/Deploy.md @@ -29,57 +29,94 @@ helm template \ -f /etc/kubernetes/helm/harbor/values-overrides.yaml > /etc/kubernetes/helm/harbor/dist.yaml ``` -## images +## images x86_64 ```bash # goharbor/harbor-portal -docker pull goharbor/harbor-portal:v1.8.2 && \ -docker tag goharbor/harbor-portal:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.2 +docker pull goharbor/harbor-portal:v1.8.6 && \ +docker tag goharbor/harbor-portal:v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.6 # goharbor/harbor-core -docker pull goharbor/harbor-core:v1.8.2 && \ -docker tag goharbor/harbor-core:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.2 +docker pull goharbor/harbor-core:v1.8.6 && \ +docker tag goharbor/harbor-core:v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.6 # goharbor/harbor-jobservice -docker pull goharbor/harbor-jobservice:v1.8.2 && \ -docker tag goharbor/harbor-jobservice:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.2 +docker pull goharbor/harbor-jobservice:v1.8.6 && \ +docker tag goharbor/harbor-jobservice:v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.6 # goharbor/harbor-db -docker pull goharbor/harbor-db:v1.8.2 && \ -docker tag goharbor/harbor-db:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.2 +docker pull goharbor/harbor-db:v1.8.6 && \ +docker tag goharbor/harbor-db:v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.6 # registry docker pull registry:2.7.1 && \ -docker tag registry:2.7.1 registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.7.1 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.7.1 +docker tag registry:2.7.1 registry.cn-qingdao.aliyuncs.com/wod/registry:2.7.1 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/registry:2.7.1 # goharbor/harbor-registryctl -docker pull goharbor/harbor-registryctl:v1.8.2 && \ -docker tag goharbor/harbor-registryctl:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.2 +docker pull goharbor/harbor-registryctl:v1.8.6 && \ +docker tag goharbor/harbor-registryctl:v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.6 # goharbor/chartmuseum-photon -docker pull goharbor/chartmuseum-photon:v0.9.0-v1.8.2 && \ -docker tag goharbor/chartmuseum-photon:v0.9.0-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.2 +docker pull goharbor/chartmuseum-photon:v0.9.0-v1.8.6 && \ +docker tag goharbor/chartmuseum-photon:v0.9.0-v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.6 # goharbor/clair-photon -docker pull goharbor/clair-photon:v2.0.8-v1.8.2 && \ -docker tag goharbor/clair-photon:v2.0.8-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.8.2 +docker pull goharbor/clair-photon:v2.1.0-v1.8.6 && \ +docker tag goharbor/clair-photon:v2.1.0-v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.1.0-v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.1.0-v1.8.6 # goharbor/notary-server-photon -docker pull goharbor/notary-server-photon:v0.6.1-v1.8.2 && \ -docker tag goharbor/notary-server-photon:v0.6.1-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.2 +docker pull goharbor/notary-server-photon:v0.6.1-v1.8.6 && \ +docker tag goharbor/notary-server-photon:v0.6.1-v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.6 # goharbor/notary-signer-photon -docker pull goharbor/notary-signer-photon:v0.6.1-v1.8.2 && \ -docker tag goharbor/notary-signer-photon:v0.6.1-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.2 && \ -docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.2 +docker pull goharbor/notary-signer-photon:v0.6.1-v1.8.6 && \ +docker tag goharbor/notary-signer-photon:v0.6.1-v1.8.6 registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.6 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.6 + +# redis +docker pull redis:4.0.14-alpine && \ +docker tag redis:4.0.14-alpine registry.cn-qingdao.aliyuncs.com/wod/redis:4.0.14-alpine && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/redis:4.0.14-alpine +``` + +## images arm64 + +```bash +# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-portal-arm64:v1.8.6 +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-core-arm64:v1.8.6 +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-jobservice-arm64:v1.8.6 +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-registryctl-arm64:v1.8.6 + +# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-db +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-db-arm64:v1.8.6 + +# registry +docker pull registry:2.7.1@sha256:df3e5e623e469600373cb327e8788e4eeb5e4a4c48e58461feb2b0d4c7f3c588 && \ +docker tag registry:2.7.1@sha256:df3e5e623e469600373cb327e8788e4eeb5e4a4c48e58461feb2b0d4c7f3c588 registry.cn-qingdao.aliyuncs.com/wod/registry-arm64:2.7.1 && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/registry-arm64:2.7.1 + +# gitlab.wodcloud.com/cloud/chartmuseum +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-chartmuseum-arm64:v1.8.6 + +# gitlab.wodcloud.com/cloud/clair +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-clair-arm64:v1.8.6 + +# gitlab.wodcloud.com/cloud/notary +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-server-arm64:v1.8.6 +registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-signer-arm64:v1.8.6 +# redis +docker pull redis:4.0.14-alpine@sha256:2c1fb6d8d5a7626b3c69a1a96f7f2471aece258e1e6d4a3d722ac65e486aba85 && \ +docker tag redis:4.0.14-alpine@sha256:2c1fb6d8d5a7626b3c69a1a96f7f2471aece258e1e6d4a3d722ac65e486aba85 registry.cn-qingdao.aliyuncs.com/wod/redis-arm64:4.0.14-alpine && \ +docker push registry.cn-qingdao.aliyuncs.com/wod/redis-arm64:4.0.14-alpine ``` diff --git a/values-aliyun.yaml b/values-aliyun.yaml index 0978fe6..4a51501 100644 --- a/values-aliyun.yaml +++ b/values-aliyun.yaml @@ -37,19 +37,19 @@ secretKey: "IpTIscRIgmerlare" portal: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal - tag: v1.8.2 + tag: v1.8.6 replicas: 1 core: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core - tag: v1.8.2 + tag: v1.8.6 replicas: 1 jobservice: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice - tag: v1.8.2 + tag: v1.8.6 replicas: 1 maxJobWorkers: 10 jobLogger: file @@ -84,14 +84,14 @@ registry: controller: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl - tag: v1.8.2 + tag: v1.8.6 replicas: 1 chartmuseum: enabled: true image: repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon - tag: v0.9.0-v1.8.2 + tag: v0.9.0-v1.8.6 replicas: 1 nodeSelector: harbor: enabled @@ -105,7 +105,7 @@ clair: enabled: true image: repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon - tag: v2.0.8-v1.8.2 + tag: v2.1.0-v1.8.6 replicas: 1 notary: @@ -113,12 +113,12 @@ notary: server: image: repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon - tag: v0.6.1-v1.8.2 + tag: v0.6.1-v1.8.6 replicas: 1 signer: image: repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon - tag: v0.6.1-v1.8.2 + tag: v0.6.1-v1.8.6 replicas: 1 database: @@ -126,7 +126,7 @@ database: internal: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db - tag: v1.8.2 + tag: v1.8.6 password: "spaceIN511" resources: limits: diff --git a/values-arm.yaml b/values-arm.yaml new file mode 100644 index 0000000..0bb1658 --- /dev/null +++ b/values-arm.yaml @@ -0,0 +1,157 @@ +expose: + type: ingress + tls: + enabled: false + ingress: + hosts: + core: hub.wodcloud.local + notary: notary.wodcloud.local + annotations: + ingress.kubernetes.io/proxy-body-size: "0" + +externalURL: https://hub.wodcloud.local + +persistence: + enabled: false + imageChartStorage: + # s3 , filesystem + type: s3 + s3: + accesskey: AKIAIOSFODNN7EXAMPLE + secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY + region: us-east-1 + regionendpoint: http://minio.wodcloud.local + bucket: registry + encrypt: false + v4auth: true + chunksize: '5242880' + rootdirectory: / + + +imagePullPolicy: IfNotPresent + +logLevel: info +harborAdminPassword: "spaceIN511" +secretKey: "IpTIscRIgmerlare" + +portal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal-arm64 + tag: v1.8.6 + replicas: 1 + +core: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core-arm64 + tag: v1.8.6 + replicas: 1 + +jobservice: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice-arm64 + tag: v1.8.6 + replicas: 1 + maxJobWorkers: 10 + jobLogger: file + +registry: + registry: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/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 + +chartmuseum: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-chartmuseum-arm64 + tag: v1.8.6 + replicas: 1 + nodeSelector: + harbor: enabled + storageSpec: + type: hostPath + emptyDir: {} + hostPath: + root: /data + +clair: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-clair-arm64 + tag: v1.8.6 + replicas: 1 + +notary: + enabled: true + server: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-server-arm64 + tag: v1.8.6 + replicas: 1 + signer: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/awecloud-harbor-notary-signer-arm64 + tag: v1.8.6 + replicas: 1 + +database: + type: internal + internal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db-arm64 + tag: v1.8.6 + 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 + internal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/redis + tag: 4.0.14-alpine \ No newline at end of file -- 2.26.0