diff --git a/Chart.yaml b/Chart.yaml index dc92f743461833a1cd1a829893634dc48a6b44f8..baa2c4320688b6607bb7217e541aaed01a798ea2 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -name: beagle-harbor +name: harbor version: 1.5.1 appVersion: 2.1.1 description: An open source trusted cloud native registry that stores, signs, and scans content diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml index 24b6b60c2db687007b6b7ac7125e67205f0f9420..d354508bbed2cb52c8c08f461197fbfa84e08bbb 100644 --- a/templates/registry/registry-dpl.yaml +++ b/templates/registry/registry-dpl.yaml @@ -219,13 +219,14 @@ spec: {{- end }} - name: registry-config configMap: - name: "{{ template "harbor.registry" . }}" + name: {{ template "harbor.registry" . }} - name: registry-data {{- if and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "filesystem") }} persistentVolumeClaim: claimName: {{ .Values.persistence.persistentVolumeClaim.registry.existingClaim | default (include "harbor.registry" .) }} {{- else }} - emptyDir: {} + hostPath: + path: {{.Values.registry.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/registry {{- end }} {{- if .Values.internalTLS.enabled }} - name: registry-internal-certs diff --git a/values-aliyun.yaml b/values-aliyun.yaml deleted file mode 100644 index 40a42983fff7c88a0a2e7d71c68302c94b52fe14..0000000000000000000000000000000000000000 --- a/values-aliyun.yaml +++ /dev/null @@ -1,159 +0,0 @@ -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: true - persistentVolumeClaim: - registry: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - chartmuseum: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - jobservice: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - database: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - redis: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - trivy: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - imageChartStorage: - # s3 , filesystem - type: filesystem - 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 - tag: v2.1.1 - -core: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core - tag: v2.1.1 - -jobservice: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice - tag: v2.1.1 - -registry: - registry: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry - tag: 2.7.1 - resources: - limits: - memory: 4Gi - requests: - memory: 256Mi - controller: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl - tag: v2.1.1 - -chartmuseum: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum - tag: v2.1.1 - nodeSelector: {} - # nodeSelector: - # harbor: enabled - storageSpec: - type: hostPath - emptyDir: {} - hostPath: - root: /data - -clair: - clair: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair - tag: v2.1.1 - adapter: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter - tag: v2.1.1 - -trivy: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter - tag: v2.1.1 - -notary: - server: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server - tag: v2.1.1 - signer: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer - tag: v2.1.1 - -database: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db - tag: v2.1.1 - password: "spaceIN511" - resources: - limits: - memory: 4Gi - requests: - memory: 256Mi - -redis: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/redis - tag: 6.0.9 \ No newline at end of file diff --git a/values-arm.yaml b/values-arm.yaml index 826dc59e95623d531bdc3a48d2a7764625283cc7..14ccbbc5c0c622c30cc715b92df1131cb3966a47 100644 --- a/values-arm.yaml +++ b/values-arm.yaml @@ -4,15 +4,15 @@ expose: enabled: false ingress: hosts: - core: hub.wodcloud.local - notary: notary.wodcloud.local + core: hub.ljsarm-cloud.com + notary: notary.ljsarm-cloud.com annotations: ingress.kubernetes.io/proxy-body-size: "0" -externalURL: https://hub.wodcloud.local +externalURL: https://hub.ljsarm-cloud.com persistence: - enabled: true + enabled: false persistentVolumeClaim: registry: existingClaim: "" @@ -57,7 +57,7 @@ persistence: accesskey: AKIAIOSFODNN7EXAMPLE secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY region: us-east-1 - regionendpoint: http://minio.wodcloud.local + regionendpoint: http://minio.ljsarm-cloud.com bucket: registry encrypt: false v4auth: true @@ -95,6 +95,13 @@ registry: memory: 4Gi requests: memory: 256Mi + nodeSelector: + harbor: enabled + storageSpec: + type: hostPath + emptyDir: {} + hostPath: + root: /data controller: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl @@ -104,9 +111,8 @@ chartmuseum: image: repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum tag: v2.1.1-arm64 - nodeSelector: {} - # nodeSelector: - # harbor: enabled + nodeSelector: + harbor: enabled storageSpec: type: hostPath emptyDir: {} @@ -139,21 +145,21 @@ notary: tag: v2.1.1-arm64 database: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db - tag: v2.1.1-arm64 + type: external + external: + host: "stolon-proxy.devops" + port: "5432" + username: "postgres" password: "spaceIN511" - resources: - limits: - memory: 4Gi - requests: - memory: 256Mi + coreDatabase: "hub_registry" + clairDatabase: "hub_clair" + notaryServerDatabase: "hub_notary_server" + notarySignerDatabase: "hub_notary_signer" + sslmode: "disable" redis: type: internal internal: image: repository: registry.cn-qingdao.aliyuncs.com/wod/redis - tag: 6.0.9-arm64 \ No newline at end of file + tag: 6.0.9-arm64 diff --git a/values-pg.yaml b/values-pg.yaml deleted file mode 100644 index 6d4f8a92e22c1bae422eb7ed01e72a26a601b3a3..0000000000000000000000000000000000000000 --- a/values-pg.yaml +++ /dev/null @@ -1,158 +0,0 @@ -expose: - type: ingress - tls: - enabled: false - ingress: - hosts: - core: hub.test.wodcloud.com - notary: notary.test.wodcloud.com - annotations: - ingress.kubernetes.io/proxy-body-size: "0" - -externalURL: https://hub.test.wodcloud.com - -persistence: - enabled: true - imageChartStorage: - # s3 , filesystem - type: filesystem - filesystem: - rootdirectory: /data - #s3: - # accesskey: AKIAIOSFODNN7EXAMPLE - # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY - # region: us-east-1 - # regionendpoint: https://minio.sxwh.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 - tag: v1.8.2 - replicas: 1 - -core: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core - tag: v1.8.2 - replicas: 1 - -jobservice: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice - tag: v1.8.2 - replicas: 1 - maxJobWorkers: 10 - jobLogger: file - -registry: - registry: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry - 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 - tag: v1.8.2 - replicas: 1 - -chartmuseum: - enabled: true - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon - tag: v0.9.0-v1.8.2 - replicas: 1 - nodeSelector: - harbor: enabled - storageSpec: - type: hostPath - emptyDir: {} - hostPath: - root: /data - -clair: - enabled: true - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon - tag: v2.0.8-v1.8.2 - replicas: 1 - -notary: - enabled: true - server: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon - tag: v0.6.1-v1.8.2 - replicas: 1 - signer: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon - tag: v0.6.1-v1.8.2 - replicas: 1 - -database: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db - tag: v1.8.2 - 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 diff --git a/values-ppc64le.yaml b/values-ppc64le.yaml deleted file mode 100644 index a2f0a3dd3bcdc94d6cb6c57aef7756ed2497f15a..0000000000000000000000000000000000000000 --- a/values-ppc64le.yaml +++ /dev/null @@ -1,159 +0,0 @@ -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: true - persistentVolumeClaim: - registry: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - chartmuseum: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - jobservice: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - database: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - redis: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - trivy: - existingClaim: "" - storageClass: "hostpath" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - imageChartStorage: - # s3 , filesystem - type: filesystem - 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 - tag: v2.1.3-ppc64le - -core: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core - tag: v2.1.3-ppc64le - -jobservice: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice - tag: v2.1.3-ppc64le - -registry: - registry: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry - tag: 2.7.1-ppc64le - resources: - limits: - memory: 4Gi - requests: - memory: 256Mi - controller: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl - tag: v2.1.3-ppc64le - -chartmuseum: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum - tag: v2.1.1-ppc64le - nodeSelector: {} - # nodeSelector: - # harbor: enabled - storageSpec: - type: hostPath - emptyDir: {} - hostPath: - root: /data - -clair: - clair: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair - tag: v2.1.1-ppc64le - adapter: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter - tag: v2.1.1-ppc64le - -trivy: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter - tag: v2.1.1-ppc64le - -notary: - server: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server - tag: v2.1.1-ppc64le - signer: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer - tag: v2.1.1-ppc64le - -database: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db - tag: v2.1.3-ppc64le - password: "spaceIN511" - resources: - limits: - memory: 4Gi - requests: - memory: 256Mi - -redis: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/redis - tag: 6.0.9-ppc64le \ No newline at end of file diff --git a/values-stolon.yaml b/values-stolon.yaml deleted file mode 100644 index cf640ab027a5733ebd445577c828e9db21330bbb..0000000000000000000000000000000000000000 --- a/values-stolon.yaml +++ /dev/null @@ -1,143 +0,0 @@ -expose: - type: ingress - tls: - enabled: false - ingress: - hosts: - core: hub.test.wodcloud.com - notary: notary.test.wodcloud.com - annotations: - ingress.kubernetes.io/proxy-body-size: "0" - -externalURL: https://hub.test.wodcloud.com - -persistence: - enabled: true - imageChartStorage: - # s3 , filesystem - type: filesystem - filesystem: - rootdirectory: /data - #s3: - # accesskey: AKIAIOSFODNN7EXAMPLE - # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY - # region: us-east-1 - # regionendpoint: https://minio.sxwh.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 - tag: v1.8.2 - replicas: 1 - -core: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core - tag: v1.8.2 - replicas: 1 - -jobservice: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice - tag: v1.8.2 - replicas: 1 - maxJobWorkers: 10 - jobLogger: file - -registry: - registry: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry - 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 - tag: v1.8.2 - replicas: 1 - -chartmuseum: - enabled: true - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon - tag: v0.9.0-v1.8.2 - replicas: 1 - nodeSelector: - harbor: enabled - storageSpec: - type: hostPath - emptyDir: {} - hostPath: - root: /data - -clair: - enabled: true - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon - tag: v2.0.8-v1.8.2 - replicas: 1 - -notary: - enabled: true - server: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon - tag: v0.6.1-v1.8.2 - replicas: 1 - signer: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon - tag: v0.6.1-v1.8.2 - replicas: 1 - -database: - type: external - external: - host: "stolon-proxy.devops" - port: "5432" - username: "postgres" - password: "spaceIN511" - coreDatabase: "hub_registry" - clairDatabase: "hub_clair" - notaryServerDatabase: "hub_notary_server" - notarySignerDatabase: "hub_notary_signer" - sslmode: "disable" - -redis: - type: internal - internal: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/redis - tag: 4.0.14-alpine \ No newline at end of file