From c9fe72ab9200f15a6fa6d06350a5b0acb809a280 Mon Sep 17 00:00:00 2001 From: Manuel Recena Date: Thu, 12 Sep 2024 18:45:35 +0200 Subject: [PATCH] Remove Harbor (#1059) --- assets/harbor/harbor-1.12.3.tgz | Bin 48625 -> 0 bytes assets/harbor/harbor-1.12.4.tgz | Bin 48996 -> 0 bytes assets/harbor/harbor-1.13.0.tgz | Bin 47793 -> 0 bytes assets/harbor/harbor-1.13.1.tgz | Bin 47901 -> 0 bytes assets/harbor/harbor-1.14.0.tgz | Bin 48853 -> 0 bytes assets/harbor/harbor-1.14.1.tgz | Bin 49159 -> 0 bytes assets/harbor/harbor-1.14.2.tgz | Bin 49156 -> 0 bytes assets/harbor/harbor-1.15.0.tgz | Bin 50003 -> 0 bytes assets/harbor/harbor-1.15.1.tgz | Bin 49974 -> 0 bytes charts/harbor/harbor/1.12.3/.helmignore | 6 - charts/harbor/harbor/1.12.3/Chart.yaml | 27 - charts/harbor/harbor/1.12.3/LICENSE | 201 ---- charts/harbor/harbor/1.12.3/README.md | 420 ------- .../harbor/1.12.3/conf/notary-server.json | 28 - .../harbor/1.12.3/conf/notary-signer.json | 15 - .../harbor/harbor/1.12.3/templates/NOTES.txt | 3 - .../harbor/1.12.3/templates/_helpers.tpl | 570 --------- .../harbor/1.12.3/templates/core/core-cm.yaml | 79 -- .../1.12.3/templates/core/core-dpl.yaml | 221 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.12.3/templates/core/core-secret.yaml | 28 - .../1.12.3/templates/core/core-svc.yaml | 25 - .../1.12.3/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 162 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 117 -- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.12.3/templates/ingress/ingress.yaml | 209 ---- .../1.12.3/templates/ingress/secret.yaml | 15 - .../1.12.3/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 31 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 150 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 13 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 230 ---- .../1.12.3/templates/nginx/deployment.yaml | 109 -- .../harbor/1.12.3/templates/nginx/secret.yaml | 23 - .../1.12.3/templates/nginx/service.yaml | 96 -- .../templates/notary/notary-secret.yaml | 22 - .../templates/notary/notary-server.yaml | 111 -- .../templates/notary/notary-signer.yaml | 105 -- .../1.12.3/templates/notary/notary-svc.yaml | 35 - .../1.12.3/templates/portal/configmap.yaml | 63 - .../1.12.3/templates/portal/deployment.yaml | 97 -- .../1.12.3/templates/portal/service.yaml | 16 - .../harbor/1.12.3/templates/portal/tls.yaml | 15 - .../1.12.3/templates/redis/service.yaml | 14 - .../1.12.3/templates/redis/statefulset.yaml | 109 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 317 ----- .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 52 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.12.3/templates/trivy/trivy-secret.yaml | 12 - .../1.12.3/templates/trivy/trivy-sts.yaml | 206 ---- .../1.12.3/templates/trivy/trivy-svc.yaml | 16 - .../1.12.3/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.12.3/values.yaml | 944 --------------- charts/harbor/harbor/1.12.4/.helmignore | 6 - charts/harbor/harbor/1.12.4/Chart.yaml | 27 - charts/harbor/harbor/1.12.4/LICENSE | 201 ---- charts/harbor/harbor/1.12.4/README.md | 427 ------- .../harbor/1.12.4/conf/notary-server.json | 28 - .../harbor/1.12.4/conf/notary-signer.json | 15 - .../harbor/harbor/1.12.4/templates/NOTES.txt | 3 - .../harbor/1.12.4/templates/_helpers.tpl | 586 --------- .../harbor/1.12.4/templates/core/core-cm.yaml | 85 -- .../1.12.4/templates/core/core-dpl.yaml | 221 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.12.4/templates/core/core-secret.yaml | 28 - .../1.12.4/templates/core/core-svc.yaml | 25 - .../1.12.4/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 162 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 117 -- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.12.4/templates/ingress/ingress.yaml | 209 ---- .../1.12.4/templates/ingress/secret.yaml | 15 - .../1.12.4/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 150 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 13 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 230 ---- .../1.12.4/templates/nginx/deployment.yaml | 109 -- .../harbor/1.12.4/templates/nginx/secret.yaml | 23 - .../1.12.4/templates/nginx/service.yaml | 96 -- .../templates/notary/notary-secret.yaml | 22 - .../templates/notary/notary-server.yaml | 111 -- .../templates/notary/notary-signer.yaml | 105 -- .../1.12.4/templates/notary/notary-svc.yaml | 35 - .../1.12.4/templates/portal/configmap.yaml | 63 - .../1.12.4/templates/portal/deployment.yaml | 97 -- .../1.12.4/templates/portal/service.yaml | 16 - .../harbor/1.12.4/templates/portal/tls.yaml | 15 - .../1.12.4/templates/redis/service.yaml | 14 - .../1.12.4/templates/redis/statefulset.yaml | 109 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 317 ----- .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 52 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.12.4/templates/trivy/trivy-secret.yaml | 12 - .../1.12.4/templates/trivy/trivy-sts.yaml | 206 ---- .../1.12.4/templates/trivy/trivy-svc.yaml | 16 - .../1.12.4/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.12.4/values.yaml | 958 --------------- charts/harbor/harbor/1.13.0/.helmignore | 6 - charts/harbor/harbor/1.13.0/Chart.yaml | 27 - charts/harbor/harbor/1.13.0/LICENSE | 201 ---- charts/harbor/harbor/1.13.0/README.md | 407 ------- .../harbor/harbor/1.13.0/templates/NOTES.txt | 3 - .../harbor/1.13.0/templates/_helpers.tpl | 540 --------- .../harbor/1.13.0/templates/core/core-cm.yaml | 87 -- .../1.13.0/templates/core/core-dpl.yaml | 237 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.13.0/templates/core/core-secret.yaml | 31 - .../1.13.0/templates/core/core-svc.yaml | 25 - .../1.13.0/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 168 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 139 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.13.0/templates/ingress/ingress.yaml | 145 --- .../1.13.0/templates/ingress/secret.yaml | 15 - .../1.13.0/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 166 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 13 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.13.0/templates/nginx/deployment.yaml | 126 -- .../harbor/1.13.0/templates/nginx/secret.yaml | 23 - .../1.13.0/templates/nginx/service.yaml | 78 -- .../1.13.0/templates/portal/configmap.yaml | 67 -- .../1.13.0/templates/portal/deployment.yaml | 114 -- .../1.13.0/templates/portal/service.yaml | 16 - .../harbor/1.13.0/templates/portal/tls.yaml | 15 - .../1.13.0/templates/redis/service.yaml | 14 - .../1.13.0/templates/redis/statefulset.yaml | 116 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 340 ------ .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 52 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.13.0/templates/trivy/trivy-secret.yaml | 12 - .../1.13.0/templates/trivy/trivy-sts.yaml | 222 ---- .../1.13.0/templates/trivy/trivy-svc.yaml | 16 - .../1.13.0/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.13.0/values.yaml | 962 --------------- charts/harbor/harbor/1.13.1/.helmignore | 6 - charts/harbor/harbor/1.13.1/Chart.yaml | 27 - charts/harbor/harbor/1.13.1/LICENSE | 201 ---- charts/harbor/harbor/1.13.1/README.md | 407 ------- .../harbor/harbor/1.13.1/templates/NOTES.txt | 3 - .../harbor/1.13.1/templates/_helpers.tpl | 554 --------- .../harbor/1.13.1/templates/core/core-cm.yaml | 87 -- .../1.13.1/templates/core/core-dpl.yaml | 237 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.13.1/templates/core/core-secret.yaml | 31 - .../1.13.1/templates/core/core-svc.yaml | 25 - .../1.13.1/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 168 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 139 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.13.1/templates/ingress/ingress.yaml | 145 --- .../1.13.1/templates/ingress/secret.yaml | 15 - .../1.13.1/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 166 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 13 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.13.1/templates/nginx/deployment.yaml | 126 -- .../harbor/1.13.1/templates/nginx/secret.yaml | 23 - .../1.13.1/templates/nginx/service.yaml | 78 -- .../1.13.1/templates/portal/configmap.yaml | 67 -- .../1.13.1/templates/portal/deployment.yaml | 114 -- .../1.13.1/templates/portal/service.yaml | 16 - .../harbor/1.13.1/templates/portal/tls.yaml | 15 - .../1.13.1/templates/redis/service.yaml | 14 - .../1.13.1/templates/redis/statefulset.yaml | 116 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 347 ------ .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 52 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.13.1/templates/trivy/trivy-secret.yaml | 12 - .../1.13.1/templates/trivy/trivy-sts.yaml | 222 ---- .../1.13.1/templates/trivy/trivy-svc.yaml | 16 - .../1.13.1/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.13.1/values.yaml | 963 --------------- charts/harbor/harbor/1.14.0/.helmignore | 6 - charts/harbor/harbor/1.14.0/Chart.yaml | 27 - charts/harbor/harbor/1.14.0/LICENSE | 201 ---- charts/harbor/harbor/1.14.0/README.md | 408 ------- .../harbor/harbor/1.14.0/templates/NOTES.txt | 3 - .../harbor/1.14.0/templates/_helpers.tpl | 566 --------- .../harbor/1.14.0/templates/core/core-cm.yaml | 87 -- .../1.14.0/templates/core/core-dpl.yaml | 248 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.14.0/templates/core/core-secret.yaml | 36 - .../1.14.0/templates/core/core-svc.yaml | 25 - .../1.14.0/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 168 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 139 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.14.0/templates/ingress/ingress.yaml | 145 --- .../1.14.0/templates/ingress/secret.yaml | 15 - .../1.14.0/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 173 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 16 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.14.0/templates/nginx/deployment.yaml | 126 -- .../harbor/1.14.0/templates/nginx/secret.yaml | 23 - .../1.14.0/templates/nginx/service.yaml | 81 -- .../1.14.0/templates/portal/configmap.yaml | 67 -- .../1.14.0/templates/portal/deployment.yaml | 114 -- .../1.14.0/templates/portal/service.yaml | 20 - .../harbor/1.14.0/templates/portal/tls.yaml | 15 - .../1.14.0/templates/redis/service.yaml | 14 - .../1.14.0/templates/redis/statefulset.yaml | 116 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 419 ------- .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 55 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.14.0/templates/trivy/trivy-secret.yaml | 12 - .../1.14.0/templates/trivy/trivy-sts.yaml | 222 ---- .../1.14.0/templates/trivy/trivy-svc.yaml | 16 - .../1.14.0/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.14.0/values.yaml | 987 --------------- charts/harbor/harbor/1.14.1/.helmignore | 6 - charts/harbor/harbor/1.14.1/Chart.yaml | 27 - charts/harbor/harbor/1.14.1/LICENSE | 201 ---- charts/harbor/harbor/1.14.1/README.md | 411 ------- .../harbor/harbor/1.14.1/templates/NOTES.txt | 3 - .../harbor/1.14.1/templates/_helpers.tpl | 566 --------- .../harbor/1.14.1/templates/core/core-cm.yaml | 90 -- .../1.14.1/templates/core/core-dpl.yaml | 248 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.14.1/templates/core/core-secret.yaml | 36 - .../1.14.1/templates/core/core-svc.yaml | 25 - .../1.14.1/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 168 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 139 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.14.1/templates/ingress/ingress.yaml | 145 --- .../1.14.1/templates/ingress/secret.yaml | 15 - .../1.14.1/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 173 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 16 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.14.1/templates/nginx/deployment.yaml | 126 -- .../harbor/1.14.1/templates/nginx/secret.yaml | 23 - .../1.14.1/templates/nginx/service.yaml | 81 -- .../1.14.1/templates/portal/configmap.yaml | 67 -- .../1.14.1/templates/portal/deployment.yaml | 114 -- .../1.14.1/templates/portal/service.yaml | 20 - .../harbor/1.14.1/templates/portal/tls.yaml | 15 - .../1.14.1/templates/redis/service.yaml | 14 - .../1.14.1/templates/redis/statefulset.yaml | 116 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 419 ------- .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 55 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.14.1/templates/trivy/trivy-secret.yaml | 12 - .../1.14.1/templates/trivy/trivy-sts.yaml | 224 ---- .../1.14.1/templates/trivy/trivy-svc.yaml | 16 - .../1.14.1/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.14.1/values.yaml | 992 ---------------- charts/harbor/harbor/1.14.2/.helmignore | 6 - charts/harbor/harbor/1.14.2/Chart.yaml | 27 - charts/harbor/harbor/1.14.2/LICENSE | 201 ---- charts/harbor/harbor/1.14.2/README.md | 411 ------- .../harbor/harbor/1.14.2/templates/NOTES.txt | 3 - .../harbor/1.14.2/templates/_helpers.tpl | 566 --------- .../harbor/1.14.2/templates/core/core-cm.yaml | 90 -- .../1.14.2/templates/core/core-dpl.yaml | 248 ---- .../templates/core/core-pre-upgrade-job.yaml | 74 -- .../1.14.2/templates/core/core-secret.yaml | 36 - .../1.14.2/templates/core/core-svc.yaml | 25 - .../1.14.2/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 168 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 139 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.14.2/templates/ingress/ingress.yaml | 145 --- .../1.14.2/templates/ingress/secret.yaml | 15 - .../1.14.2/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 173 --- .../templates/jobservice/jobservice-pvc.yaml | 30 - .../jobservice/jobservice-secrets.yaml | 16 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.14.2/templates/nginx/deployment.yaml | 126 -- .../harbor/1.14.2/templates/nginx/secret.yaml | 23 - .../1.14.2/templates/nginx/service.yaml | 81 -- .../1.14.2/templates/portal/configmap.yaml | 67 -- .../1.14.2/templates/portal/deployment.yaml | 114 -- .../1.14.2/templates/portal/service.yaml | 20 - .../harbor/1.14.2/templates/portal/tls.yaml | 15 - .../1.14.2/templates/redis/service.yaml | 14 - .../1.14.2/templates/redis/statefulset.yaml | 116 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 419 ------- .../templates/registry/registry-pvc.yaml | 32 - .../templates/registry/registry-secret.yaml | 55 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.14.2/templates/trivy/trivy-secret.yaml | 12 - .../1.14.2/templates/trivy/trivy-sts.yaml | 224 ---- .../1.14.2/templates/trivy/trivy-svc.yaml | 16 - .../1.14.2/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.14.2/values.yaml | 992 ---------------- charts/harbor/harbor/1.15.0/.helmignore | 6 - charts/harbor/harbor/1.15.0/Chart.yaml | 29 - charts/harbor/harbor/1.15.0/LICENSE | 201 ---- charts/harbor/harbor/1.15.0/README.md | 422 ------- .../harbor/harbor/1.15.0/templates/NOTES.txt | 3 - .../harbor/1.15.0/templates/_helpers.tpl | 581 --------- .../harbor/1.15.0/templates/core/core-cm.yaml | 90 -- .../1.15.0/templates/core/core-dpl.yaml | 257 ---- .../templates/core/core-pre-upgrade-job.yaml | 77 -- .../1.15.0/templates/core/core-secret.yaml | 36 - .../1.15.0/templates/core/core-svc.yaml | 25 - .../1.15.0/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 162 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 146 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.15.0/templates/ingress/ingress.yaml | 142 --- .../1.15.0/templates/ingress/secret.yaml | 15 - .../1.15.0/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 182 --- .../templates/jobservice/jobservice-pvc.yaml | 31 - .../jobservice/jobservice-secrets.yaml | 16 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.15.0/templates/nginx/deployment.yaml | 132 -- .../harbor/1.15.0/templates/nginx/secret.yaml | 23 - .../1.15.0/templates/nginx/service.yaml | 94 -- .../1.15.0/templates/portal/configmap.yaml | 67 -- .../1.15.0/templates/portal/deployment.yaml | 123 -- .../1.15.0/templates/portal/service.yaml | 20 - .../harbor/1.15.0/templates/portal/tls.yaml | 15 - .../1.15.0/templates/redis/service.yaml | 14 - .../1.15.0/templates/redis/statefulset.yaml | 125 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 431 ------- .../templates/registry/registry-pvc.yaml | 33 - .../templates/registry/registry-secret.yaml | 55 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.15.0/templates/trivy/trivy-secret.yaml | 12 - .../1.15.0/templates/trivy/trivy-sts.yaml | 230 ---- .../1.15.0/templates/trivy/trivy-svc.yaml | 16 - .../1.15.0/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.15.0/values.yaml | 1058 ----------------- charts/harbor/harbor/1.15.1/.helmignore | 6 - charts/harbor/harbor/1.15.1/Chart.yaml | 30 - charts/harbor/harbor/1.15.1/LICENSE | 201 ---- charts/harbor/harbor/1.15.1/README.md | 422 ------- .../harbor/harbor/1.15.1/templates/NOTES.txt | 3 - .../harbor/1.15.1/templates/_helpers.tpl | 581 --------- .../harbor/1.15.1/templates/core/core-cm.yaml | 90 -- .../1.15.1/templates/core/core-dpl.yaml | 257 ---- .../templates/core/core-pre-upgrade-job.yaml | 77 -- .../1.15.1/templates/core/core-secret.yaml | 36 - .../1.15.1/templates/core/core-svc.yaml | 25 - .../1.15.1/templates/core/core-tls.yaml | 15 - .../templates/database/database-secret.yaml | 11 - .../templates/database/database-ss.yaml | 162 --- .../templates/database/database-svc.yaml | 14 - .../templates/exporter/exporter-cm-env.yaml | 35 - .../templates/exporter/exporter-dpl.yaml | 146 --- .../templates/exporter/exporter-secret.yaml | 16 - .../templates/exporter/exporter-svc.yaml | 15 - .../1.15.1/templates/ingress/ingress.yaml | 142 --- .../1.15.1/templates/ingress/secret.yaml | 15 - .../1.15.1/templates/internal/auto-tls.yaml | 81 -- .../jobservice/jobservice-cm-env.yaml | 34 - .../templates/jobservice/jobservice-cm.yaml | 57 - .../templates/jobservice/jobservice-dpl.yaml | 182 --- .../templates/jobservice/jobservice-pvc.yaml | 31 - .../jobservice/jobservice-secrets.yaml | 16 - .../templates/jobservice/jobservice-svc.yaml | 18 - .../templates/jobservice/jobservice-tls.yaml | 15 - .../templates/metrics/metrics-svcmon.yaml | 28 - .../templates/nginx/configmap-http.yaml | 150 --- .../templates/nginx/configmap-https.yaml | 187 --- .../1.15.1/templates/nginx/deployment.yaml | 132 -- .../harbor/1.15.1/templates/nginx/secret.yaml | 23 - .../1.15.1/templates/nginx/service.yaml | 94 -- .../1.15.1/templates/portal/configmap.yaml | 67 -- .../1.15.1/templates/portal/deployment.yaml | 123 -- .../1.15.1/templates/portal/service.yaml | 20 - .../harbor/1.15.1/templates/portal/tls.yaml | 15 - .../1.15.1/templates/redis/service.yaml | 14 - .../1.15.1/templates/redis/statefulset.yaml | 125 -- .../templates/registry/registry-cm.yaml | 246 ---- .../templates/registry/registry-dpl.yaml | 431 ------- .../templates/registry/registry-pvc.yaml | 33 - .../templates/registry/registry-secret.yaml | 55 - .../templates/registry/registry-svc.yaml | 20 - .../templates/registry/registry-tls.yaml | 15 - .../templates/registry/registryctl-cm.yaml | 8 - .../registry/registryctl-secret.yaml | 9 - .../1.15.1/templates/trivy/trivy-secret.yaml | 12 - .../1.15.1/templates/trivy/trivy-sts.yaml | 230 ---- .../1.15.1/templates/trivy/trivy-svc.yaml | 16 - .../1.15.1/templates/trivy/trivy-tls.yaml | 15 - charts/harbor/harbor/1.15.1/values.yaml | 1058 ----------------- index.yaml | 285 ----- packages/harbor/harbor/upstream.yaml | 6 - 509 files changed, 51775 deletions(-) delete mode 100644 assets/harbor/harbor-1.12.3.tgz delete mode 100644 assets/harbor/harbor-1.12.4.tgz delete mode 100644 assets/harbor/harbor-1.13.0.tgz delete mode 100644 assets/harbor/harbor-1.13.1.tgz delete mode 100644 assets/harbor/harbor-1.14.0.tgz delete mode 100644 assets/harbor/harbor-1.14.1.tgz delete mode 100644 assets/harbor/harbor-1.14.2.tgz delete mode 100644 assets/harbor/harbor-1.15.0.tgz delete mode 100644 assets/harbor/harbor-1.15.1.tgz delete mode 100644 charts/harbor/harbor/1.12.3/.helmignore delete mode 100644 charts/harbor/harbor/1.12.3/Chart.yaml delete mode 100644 charts/harbor/harbor/1.12.3/LICENSE delete mode 100644 charts/harbor/harbor/1.12.3/README.md delete mode 100644 charts/harbor/harbor/1.12.3/conf/notary-server.json delete mode 100644 charts/harbor/harbor/1.12.3/conf/notary-signer.json delete mode 100644 charts/harbor/harbor/1.12.3/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.12.3/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/notary/notary-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/notary/notary-server.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/notary/notary-signer.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/notary/notary-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.3/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.3/values.yaml delete mode 100644 charts/harbor/harbor/1.12.4/.helmignore delete mode 100644 charts/harbor/harbor/1.12.4/Chart.yaml delete mode 100644 charts/harbor/harbor/1.12.4/LICENSE delete mode 100644 charts/harbor/harbor/1.12.4/README.md delete mode 100644 charts/harbor/harbor/1.12.4/conf/notary-server.json delete mode 100644 charts/harbor/harbor/1.12.4/conf/notary-signer.json delete mode 100644 charts/harbor/harbor/1.12.4/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.12.4/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/notary/notary-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/notary/notary-server.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/notary/notary-signer.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/notary/notary-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.12.4/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.12.4/values.yaml delete mode 100644 charts/harbor/harbor/1.13.0/.helmignore delete mode 100644 charts/harbor/harbor/1.13.0/Chart.yaml delete mode 100644 charts/harbor/harbor/1.13.0/LICENSE delete mode 100644 charts/harbor/harbor/1.13.0/README.md delete mode 100644 charts/harbor/harbor/1.13.0/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.13.0/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.0/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.0/values.yaml delete mode 100644 charts/harbor/harbor/1.13.1/.helmignore delete mode 100644 charts/harbor/harbor/1.13.1/Chart.yaml delete mode 100644 charts/harbor/harbor/1.13.1/LICENSE delete mode 100644 charts/harbor/harbor/1.13.1/README.md delete mode 100644 charts/harbor/harbor/1.13.1/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.13.1/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.13.1/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.13.1/values.yaml delete mode 100644 charts/harbor/harbor/1.14.0/.helmignore delete mode 100644 charts/harbor/harbor/1.14.0/Chart.yaml delete mode 100644 charts/harbor/harbor/1.14.0/LICENSE delete mode 100644 charts/harbor/harbor/1.14.0/README.md delete mode 100644 charts/harbor/harbor/1.14.0/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.14.0/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.0/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.0/values.yaml delete mode 100644 charts/harbor/harbor/1.14.1/.helmignore delete mode 100644 charts/harbor/harbor/1.14.1/Chart.yaml delete mode 100644 charts/harbor/harbor/1.14.1/LICENSE delete mode 100644 charts/harbor/harbor/1.14.1/README.md delete mode 100644 charts/harbor/harbor/1.14.1/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.14.1/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.1/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.1/values.yaml delete mode 100644 charts/harbor/harbor/1.14.2/.helmignore delete mode 100644 charts/harbor/harbor/1.14.2/Chart.yaml delete mode 100644 charts/harbor/harbor/1.14.2/LICENSE delete mode 100644 charts/harbor/harbor/1.14.2/README.md delete mode 100644 charts/harbor/harbor/1.14.2/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.14.2/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.14.2/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.14.2/values.yaml delete mode 100644 charts/harbor/harbor/1.15.0/.helmignore delete mode 100644 charts/harbor/harbor/1.15.0/Chart.yaml delete mode 100644 charts/harbor/harbor/1.15.0/LICENSE delete mode 100644 charts/harbor/harbor/1.15.0/README.md delete mode 100644 charts/harbor/harbor/1.15.0/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.15.0/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.0/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.0/values.yaml delete mode 100644 charts/harbor/harbor/1.15.1/.helmignore delete mode 100644 charts/harbor/harbor/1.15.1/Chart.yaml delete mode 100644 charts/harbor/harbor/1.15.1/LICENSE delete mode 100644 charts/harbor/harbor/1.15.1/README.md delete mode 100644 charts/harbor/harbor/1.15.1/templates/NOTES.txt delete mode 100644 charts/harbor/harbor/1.15.1/templates/_helpers.tpl delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-pre-upgrade-job.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/core/core-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/database/database-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/database/database-ss.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/database/database-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/exporter/exporter-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/exporter/exporter-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/exporter/exporter-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/exporter/exporter-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/ingress/ingress.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/ingress/secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/internal/auto-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm-env.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-pvc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-secrets.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/metrics/metrics-svcmon.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/nginx/configmap-http.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/nginx/configmap-https.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/nginx/deployment.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/nginx/secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/nginx/service.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/portal/configmap.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/portal/deployment.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/portal/service.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/portal/tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/redis/service.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/redis/statefulset.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-dpl.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-pvc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registry-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registryctl-cm.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/registry/registryctl-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/trivy/trivy-secret.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/trivy/trivy-sts.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/trivy/trivy-svc.yaml delete mode 100644 charts/harbor/harbor/1.15.1/templates/trivy/trivy-tls.yaml delete mode 100644 charts/harbor/harbor/1.15.1/values.yaml delete mode 100644 packages/harbor/harbor/upstream.yaml diff --git a/assets/harbor/harbor-1.12.3.tgz b/assets/harbor/harbor-1.12.3.tgz deleted file mode 100644 index 955510daf84cb4fe1718d6d463d9215bd8f05e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48625 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 K4Xy|U?*9Q#|3H!e diff --git a/assets/harbor/harbor-1.12.4.tgz b/assets/harbor/harbor-1.12.4.tgz deleted file mode 100644 index 86b6031669f0c8d0ed361d7dd784939e31bcd6c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48996 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%0A$olj zb3j!U;2BMO(jessXz`UTj{=GKhE<;a_#R;y`pjKn(xi>bv!9Dp6NU9XbCk~&7FzUw zRS$^>lqmYXst^T&|LKc)f3-MPI#kUZ*z2%2Yytz8$eZm+$OT@QvBoj>&MQp@3q}bJH5rV&TmGW!c^i@>t!K(MxW5|IYHI0B6%wJV9e!{8(3*WbCh>XRUkWb znExh-s#xX8- z2MNc~TJI-EKEJJ+QO9Qqt@v`two2n7htmjmwkLibaS~qSHG?=G5Br9{!xuwI9zzw( zRurto7)lB^DjrrEqY~wP{pG>j>@?4tT<58{ged}CPHTy?FsW3J8wABXP@jroot_OV z1ENl#NWbx7;}c!#R`K{3MbT5v_EUs&m$8xp^h?Ls;+OXyv_@OHI@@gLxkr8ZqJ*t% z;bq7G1}ob5Oie>ARbu|BMY16Qx>w9ZnDS}(^Bk)?NLJJ6ajjG+%4;Uz|u2$J-w(vrCnJrOa4Xf2io!E^*17I-LYEZ_gULY zj-O~l@6C;#M7*n#YV}Ig${k`oh(^qW6LkIl8hZu>uWnqu)vVyq^f#)9N0%N z&Sp`i$2$-FUTLKi+E5p=+?TpfU2?it*6h#JDfSj|!eC28?l_=I+fIF$*h~~q(v8qh z_iJEc+yYHqX;jrL3K$EA&s&TH1gOF);Q+dzUT&!X@P)q^VQZoZ@e_zIFVJBOKc(>* z!~^43^%QeuOGFKZN6DO*k?mw@2*q0woa3RadyS5|IY{V)?v~fR+VYk0pG&6naB!Lt z3McjEjZwRc?siU`ePc&N7F(-&F*j6?MJ+PU$DTY;L7wEeDgUT`d{;`dY9rG0Jn=sa zJ2hy&OkgiIf$k8uwTS%5Piv$*jG+Hw#^kfNfU(-|*(WHWuJTR4TTTY-^yP~@I!grg z=Z-Ukme@anmK=(PX7)F3Y{|gOKuitD#79+$55UP@`Vf6igCroQrZ__q8697%8>4;bk*$1h~UTFbh?0-EJ zV5(8gdl*NqO_4%LCfHMYsx-!r!CXK^H-(!R(ia1R zO_csz>&LQ0Lwk3ww`WeyfLk3eJOwTL5#Qe0z?2o%m;3gSl%(Ags@T{-+E|7FZa(6W z$w9(y5%3wLixBMU#-T8tN~noi3X{*lGPDLHy01FJ!&fNw&Z(DHy#4?730y9va|1b&W}>FMe1;;9dzz#73yFy-D&3@gNqabAx_ z7#F^30X`gHsZs13_#7sLNtM;PBx~Psvq+Xg%a|(1baKe7m+^t6{<<;qtMyin30rF` z7_}wcpJwF`H5jK(ZM!||pvTwqU3F^0Xd3SgJ-)m%PNnRW-WS249I&Qb`PZCYmrreH z(a>(Bd#G{YX?CSsU2YU&UtA7fro(Z${^5uJHKcRS;Ee#|5c_?@eA%21Ug3mi@VuJZ z1ji2v`+d#NvQ(tNLo76FJxoWtU7YHbbp22r&guyX{?tCwkhSjXT8)eXPi)nGoS>H$ z9Z^cDi$#=(9x2#coZ{tZO_PucZ^>+g{gsc;!$l1`DGh4Oba3xSOdGme1H7UNWNiqb)>|M1cdZb;P{=$5Z|1wboe@I}84BI+IcH<3AuSoo*tVyHT>|ccu%8UqYb=NCIljsfa{%C*QqMXIl+)m$>9=9*R&=>yl$Rzja`C*><+L!95q)V{R3cbS?t!22-#N+umcQ#bc zqNQqKZMi@Zdj_+mX=NQGmlB}np)7H}*u?seFca+75D?%Kqa^~ZSN?_RgQy^tf=|o$ z>OUAtt$q0xh4}Ek_kDJXa%@G=z#{TTjBQvel>TpJ@%N5AC&VO_u?(wT6rH*d&%oU* z237$*LbLbAb_#O(5desaNH$Q6(k1 z!B55aO37K6i_ik}N<3FD6>nX6r_2nc#B=+9ywfNW@&H*vid1%jOt0Ou*c;t1CgM~d zWThyxf>w$ZCJ}O_<4ymB-phZqX#2HIMkRLu10&A!Yp~NK)MwKa2+e9b`&Q-6S&Y6# z5j4nT_u>;j3B%4Af7)!T8Xmi`#jdZhGU0@^vO1b6FL?QQ?P|caIJQ%bLN{#ey)o!; z-g8iljyf5x492~@vtVnA^^vZV<=aL~_u}Bx z5qQ1Ro}5$Adf~2pQ`+}~yseZ2_oaI%qa})xqU#yc0Mcp{GoOa)JF4Vv@BVSCaQH?K z@gsNr_Ri=Z2xOwPf}9x?oS<`6WifQFP8X)aQl($b^K*xBAFMi*lH$Bh>knt4v}Zr8MRxUJAikd8nknd>wT4cF7V$bu*x8|c zI_YocBAM|(`hmN&e8i5J1nGQDEoQYs+0Y*w(86lu(y#S|m~z>iGS(V0+hqiO?)NNd zWp$Xh65? z>0eQYl3odkajG{SUe8CBl^Y+_W9Flo$48Yd7q~v}DgP;z|KPB7yG*ao%?W5y8(zm%)+2eQp{IM>+TBV0|5oWfD=#8rh$CsJyVS+sNV9`TqCPA{N>dM4a+mlYLxdqQnT4v03&DBZ#a` zxriI|2vcBWDcm`I^hmmJwX*;m*P8ui!*h3u3cByI0C{z$pECy-ohK^>g1FCp|Nc>2 zDFe?%2X}npJY!B;6DZ65DB|K=@FfK||1loyqwhCdEQ(zR-HI>FWf+q%Qg+13op&== z*6DMO--8bRk5g`l%kDI!L{CpSVZ_c+-621g5skrOl-iq;4t=y`z)3%DF&pJf?>kvF zQp64vFvl}HTBt)CPgtlH>P1jcHjX#f^ip7{326 znDFbou*#r z!Bfqi@vaC#`$Ra=0&|@`!yI+7qaZQ;`uMB{p6SQ?-N?V?+-f0zo*{v8ut%%0UlBht z@<84wa}9C3zhvee0eY*u9D};>uTR=BIu;NLHYpJ?6uGrx+Qyx%GwgQ1sX+%FK+D8N9w-38Nae7k#5|>iD?9<%vZ7mLG0lGhKM*On1eg|NgjcOO@ zj?VcRYg4Afv=|Z{F!{IA2Fa*(OWtXIu)VH|eO(nph~V1y7opf0wM)-G!>UYhBnS+Y zwhLZTR;ZH-rWxH%)WQ0;Ti;65jcOaD&gZ5q8pcdVSx^+%tY<|Q1%HdI3G_xlfnbWkPOMh0k;lq>oH~CT8VPAK?PFB5G%ABjl=; z2DO=Uc-j4}99o_oB@ywWsxpc54QdVKW zpbXpcop0Vz+2BL9vmhYYjxvkRi!F9B8lDV?RsJ9%F?L#03X|JB{8^wKxNVM=*2&HO z5fvU8(T(|Yuk_9l^XT`~Qg(Zm6g)x#X|1VQt~f)%|59sagjy15{HJdV z2||YJpwE72z;d8Fb?*Qqvsg1hjE~3;^#w5Q$gHdJw^yh4Id()A?>SWB6`9eu<@2Pu zg392Ht#}qnv8P+Ix77+Jqc3f!5`t$aCZ*#Hzrc+?F%px}a+zzkNcKYV?qATzhSr5ZxuZ0?k z=uU>n94=er=Rz$?Cjf5DK{QjFEEV3y2@woSh~I54c!+Hn3(SrsdETq&)LZwWfri%k-sfEukdtT%eRA-^BRbf0PsU)rNS2CL;$txtV!pj?Wp?u)CkCipd4EPZ zG&&_#tb(#q8+0Y=a%ga6rA~#lccYt(Tt7xT z-YBa;`zg(UXu{y-hrUQXSw4Y-0#FM?OhA5<5<{b5|JgwO=b%Dwgxn!V`6cu_f?)JW zSh6wNM_TyoLY|C%2kZ~ZH8XG9r{mRse&Cs}VVUgRy{f-~q9rMcR9r9je1{vmt$e6u z718_-Uu>4KskCyS-(x((srk-ltGKf*R)hsqY#vkpHvdU2!kpJqV?WlV1huvgr~Jec(F+mTw*kSx453aOz*IkZ&hN{ z|Nq|r&U4!aIXG*=@NbI2T>tNPIBx&no)#y~;{fB~|1&_2R!%8I^U6un*mHrZ;DZQI zHpdpCS$hFjBJwXzW3`&ojw)LugK@Pc{xJhG_-@ZRTmzd1R@zvjT0)UFKCku!Vg13G z2L}JMS<5$eGBT*J4NL`n+x%AkzlHK_d{)e{&6jLxEw4v_Pn>z4ACDusUsWZ#qFfG< z9ss9MM;XI9W06YbFglBwdJ!$En!4KbJQUWjF%;f%4nZiLP{yt)_7VltXyf*)v|aNo z_zkYSSd~n$DvJs4 z{Wwk+x%gP^HCJ}mJyxlrAmT4%obL?MgmU{kB+wWHQ+OHOb{&h|aOi#@y#6*rB_&CJ zXL`Q%hJtcg6728fB&T&59Om4#7Tm)=IZpi+i+A)}Fi_qgMk)!tP|R%(LovVql)#D# zy)Ip8Xs{#w9(OM1^7$r3(M4%tky6Ob|8Ju>(_%~>fZX&3U-yxRJdHS8O0=iQCOI6( z6lELu;YtDvd!3YjkcH7I*7ux{o-qu8-t}PxApla*Fz`fO$dmp>OVFf-tVTQLRI)WW zS0h0(?-)9E{v>(bFmBl~zLjYf6qvhX@tdBKmM4WmiR0q+Tgc6alo`z&os7~SDukK? zY{2u*s3qxVam)7abhVyG1_(DPXz`ASVo!p9yX4;B=G}f6WF1M-snqw&VTDFp(<8zm zzp*(5T~@-@Q#sb1AL&u3BOixIGT$}#@R_5X0j5@Q!7~bU`zO&w>%;k!A}PxJy_zGL z20A`B4Nz64Xm+isH(CD~cQ^9}Pk?F2{AzZm_rZsd3I%Ygli1Xkc2Ad0<*&8ozjCC* zsC}Cf$XH1L>c}5|4JLLDWq3y!yKIup1AUHNw!Xs+$9DH}XjzevFKoE`MQZ}EB1=Ut z^%8;ejxZp`p2y=WbT}qi@O3-F!6KWo`Oo<*2^fxP2no`y3}#V)CEmY1cK)AQ2|Ni6 zQ^pZRhzv(O;El_nZZh%1g5yIU8_g1ekDBbi{_B1X)rz&Z-TDA|Be0BEmILw%7D3?6 z6a0gfj4a#oesox8vP3lFGeu>q{x>QfJro(oZD64=;vAZsTKG0Hl?Fz8=W`;CYw(?) zDj^^7z`-NtV+y{FjI^S38v+HEDGelSD=09y8~7h6#p!O>@9zimqd+yKLJ(|A=%>`i zsF0N=N4lL&&`Nj*L%?;9W};x?yxTLeXJqBc(X8R2n^6_)S_G0zY=WBviQ&>vwqZu4c?DgqMg&QA zH4paG7jm8;e*(x{Cp{IT$^cu-h4uPPjBzrUrv&^|(i*JR`Jx3AaE>oYI+@YOlg57=6+wiS#u$S*#xlj9_&lvU;izzTa_W*3ng zE+^La-?qRbL!X)}gLNP0i$08=Z~@^d5>AOMznYjIz|Wf&?T~jm6td_mI(<)-+iJWs z*MhjQvg&01Hjg0RJu@o-=xv%rY<@syvP|l5PxUjUtVg&=7*O+WQ4lcro#|gX(TrU4 zKh*c1Bv}$$n}6EM_32W4OTcT>ao~dka^!k_H;YyiIWpg1V{k~0TrUug3<5jzGeA*u zJq5-g6*r&8Wpjor`PXlCVfZci{ez%y@->&s!dA~k85bOiIV??7%^HUAuDk~L9fCxY4 zf9yQ{r8YAG7KyYOrq&obN|#5d`z5mbYO7p0Asy^(iR8{RZ}!9TTSpRCy9QIH>OKj! z8pExX4vTJkdqr?YEXlf7`P>DOchjy>PwIQEXEZS0BA{^>UwKAtc7hok5@>bdlb*B)i zK&E3|&5ng9$R2(ldxeP)k5(5vyg|7eBn^~fN8;Tl2*hb9R{$(Mz8znNW6*0Hu2Xhf ziVBF<6Df+k^hGW_B?9To^k5B^DVsSz$l+=kv!HhRJ&Mrtzo1w}!G*4@)Ss0;`4(>r zFtMOz1lZ##Xp&aL?)<-2+M7_san#i1u3AdxEoN3C4EM8Qv8Ps67I)7M%NJhYY4+MO zW1e5i4}_DRfyfb4Q}J0=`Xzk7Pq6l;XGST|Ipvc2P-&Pqs(uHg`+h~&prhsUAT$XA zsH_D_p`M2&yJ6An1J+n@HY@+yjUXynH%{~!iZ*!4N}x#u#UPYe?|%=~;{RK$)c89~ z+4>1tcdch=>ugUtx&>4kD?OWi;zv!4BJx*G6G}UYpa6GHxA=ro2ROmnRwSXy@}>yY zCK2JJ>e~GY4=I@P=a=N)-JiqI?mLM?W zS9HCLg-W>CsG^JGYN=~2#zVcK^mpU_t`$7Z%!_o~Tj)(}F>ny(+y{BOy@&)j;R_;QVmYr{*L#;?$exfjQ6bm259G za@`L4x-k?B7B3c(nKq+7c{=LD!Eu=mk@|7xwJq9tw|MX85fpIMc(r$3j{oIr^#TkY z3?&pt(>luI`M8M!cv_Vn%IwKEos`AbK*a3gfZ~>6OjBij>rt?GliZW`_v0PFpf0iW z6+sE_g_MaXkJwz1Xdt=&JMJs~&6Zk>zQLYOJ4a^u8Uj>aEE>r2eEp+iC~KOcsYaG&GD^XEXgP;c|oKXq7cvGL#Tu| zgRKK);wPY)Eks5ex75Yff9O_7(A7i{>i&g2!2;5Sw%6&$gwGFF3SDs9O@@Wxh@3Ot zn_%<78IeEBJ4Q8IEl@jd|Act`h;TgAdHWZ6|2$;g^;CHUPk|wcX|7Y%y6W*5WkG&C zyy3F6yVb;Zt#L*L7*wnI8Gc1;Qu9xog&$_GJp1=_7-vjoy6X`gv~#5QCq3!{;oR`K zIu@eI#6K!oo*BtRAkN$)noO*E4CRdE61!GnYmXreq4j6}dQaVY57SIHQ%NPPFVpW= z%W6}d)`TZtB5>--VZEXWe%pBhH-Q!gFTN$3!<8mjiYpa3CvLlTwEJaNK42cSFlq4p zh7hig*#-)NB1ZboO4-)zC-Cc$Nt87`9*>nZ-^_FKNy3M9nFR&tfEH9VcQ}Em`8e~< z^9ya5i6v}Nz}oBUT3NuUG9#Qc3$BKbYRq)2nfv_HG1ORQMtGh(Ww=!R@UO6RtvoLk zI0JMr&+2hcRft(?!~}p>w55TYICh7AdvFpK2mdiG_Uog)1l)MU%h`j-5!PSOIEe)% zOKKLOU)z@0V*Dy*EJoaq&A$8T$1FGft~V6hDV~DpwJcNuW%r?`ARr7AAeHhrknLI2 zEy^Z@@1;kM<8zc;&^xS#c%Pa98d#F8sYfjb(NY#o88#Z;xo8@`m_@H7>#N?3?ck4J zvt9^yD6GOmPf2(`@jyP}?>QuN5F0K*M-S4~36kB$6+fARa71ZjqchxyT+AZjnoK3w zG*L)$TVysizA%AKv>5R^6g*dgbQXJs+EBuatm}~Y89(R?9F(J^4w&06Ng37yTbxW& zwi9=Oc`_W4T2oA(>tT4;SA{g#~|9RIqDqxY#EM_Q%07uD7GWy{85wzeYwx^4MW4-s7Z+t}(({+@cukqo@) z1{lx8!UbeLA)In@J#k6ggzqBACMv`&^gg8sN0L674) z>WBc-jsMeSm^#0B%j5byzCxcv$!%S7`9~6qz&bMxCnauoRS6GsGxbr0F_D)eF%1E| zw;5S>Zg!`yuJ>zOXk~`J*a2BaH05foejU7motY`NV|)s$OZiZaaHt)~I*%-XxZfc< z`aKA6MoC}ORUnVe_a7Pi*w(%MtCJoM8i{K1s6ttpn+fM*190MORe>s^ zia6{kL_`5SemF4U1`I+DEH(|=J;=PgDG+oS_Z*sM((f`_U13O)_xE_}OP@;^n|K$= zA9yRGDE>z)6IW7PJq5I9ecX*jLG-ZsMMr;$$+4GVu6MUxX8nAbJbb}f-5>ce;Q>Q-f_FdRE!su}EBMZo;A5S{KfrZwWde*@z> zv})CRQ}M6%)&QZ!l&zvS+mA8Xq- zd(;@NzMFE)FGB3|yKY<>ZOw|7O@6}>5G;+Yo?cV9l0L{10ZiP-Y2)LE|82W_CmGbg zx(!@(R>1dpJ*gmQfqm2Mk=Nn5Xt}fE{AQ8)|FkSARTkLy6#v%|=E0|!vooso?c4Cu zG0<(!nkR&s+hNp%6YR`F?6`MYs4rHLH(G0o6|>;# zM-jGMl08c#;uTb}6|K<01y#s#Z|uL{FPAA%hq->=L5ByCUI^Wv4u>F)fstSUH1c5_txOT@jWRzgR7p?0 zJyazbg8avvE%MT2Z6@U1T|HybF}>s;a5xeJ`vS%Pa!J)A^P@Y-GR>gMm2lG?4 z#b|U4erWyg`KfjACB(IL(ww|x`}!Ac*T(A$ym;~pHgve=@V}f>&k7$-%LW{|2xB0u z35QqPT(+Ay6ft2DC6HgA5j^L0@-xwJ4=?*a`b>C^{jD{_h9OLtYSt3{q>e&U$)f-p zvrNCm!c7wqm~U3eb0wi-cTaT#)e@CQQDj(p{nv>%!JzqUsC+fR!V%XMMUFo)dT?XS zGKHVH$TXGHD+tnMqfn^ZppHgp-q$?=e$UIgZJU==@?oFjCWY>w9o{vE1p2T34(a$V z<}#pDgFKn2mco;3v7xhe^s@&=|F`}6$6h|#vu+eAe;mxC*jA&0AK(h_dPcY)kC(+4 zZ+Md(m(93^0M)cRdpqAx9%US0hYkKEFu;5lO3CJB45+q)0ILxBwRuiXn0abYM^9Ma z2d`O|_!pnBmOW?G`mbrh5al7j#A4hmyp1em7#`~V5w1fCe-Q@QL6MrDHYW>Nzzj@i zH&v)V83uQ!=|+4*+sYTVLYrfznYfLRi?@;43&U&qfHVSHIKgc=Z3xEf`ZWug2gW;E zi8+1Etr1_0cOe2KdWDK4EwbpoMNKEDOGl5YHi5R0;3-Bvob3c5`S-Jn4-%gfd-TBr zi-NQ?D0qSd;6naWuw>%q6#&0)7q}a{y@IhPvVd_AyN&=m<5{mEhVRwesobHy1flV6 zRz^;>80W%x?-;Sx@|F5`Od5^f^#1HGTeQPXSBq1wywf5CJW0J7N3K(Xy)~38=JlN<~fGAFhrjCWyk(c6pKtrr0I4sx26t zh^%rgIA+AHvku8YJl3LMB4CP-%Z=xp-G*P|YH6yQdo1OSu!u`j9iasGh$^i0_Mi>6 zU#$re{Qr3d^!8B*fIFS`N@aN1YKTgTmS%^%DiXeNx4I!wT+888cFi$YMrERTLyvD@ zj##vd$HvdgMHzjm*m*|drW|4t+RG|)6nMj-S_IIHBQv%N7DP3;rv}GvY0 zn%612x{s4cJ*5@zVXBeZTF!QV%N10XkxnO+!}=5+lvap z5J=Rds@KIPTMU?}g|dc9SuuL$93dBkdFq-UzmicL{AYTSxZ#MZyx7XSPx-br-KmD5 zN#Gvl?OP7QSdP`jXjXA8&b0$>Fx2)Lw;R&LIZ=lGlKNf+3vJ~WRXZn8ScKg0_ z8X$00W!AoCPKFD3aWVxzrxd%bLeWw%$xb7CzjXo-hBlRgmZaV5iW=-dK&GdUR_u}R z28KStr0$$dMGY=7P)`6lq6_i+-41+G2%(AsMgrPA}nOZd2H{`OrXVK&Fy#3FyW3! zF=Mn8*;41RvV5c|AbaGV=s%+vB+XB`%}~)BWb7 zl~6wydqrUtF9nT#gYR9xjzByY`#o>{$qI%Ezu^Xcqwswrr8@|crycwxi9kFp2ao>` zCdVbjB~Yq~8EaLgX}y5<$}nbzK>ipisc!tUL>Q^yIxLI*>auBQu+c`iwSC7eWNSQ? zEKndX$JpvT5Tc;fG@Yf{W-Dse1;eXeKIxFtjgw945S*668-5Q9DgUHyuzlA?mQUt2 z>KLZEfw%|N=){=|ln?wNKvYwf{008-b=@9){e6CJ^ZKK+?do{PXQ#{m_8Fe@^h?|C z7w3<+7r#1xzv73duI_0?@ zjAfPIqC-oJOokkw*Z>S&9|B-3b8j5f>OiY%a8a?2ST~WJtfMm1K@uWU4iZ4M!8UsqW0tZPw{J8Q7d8hQc(*uU5`H^OPreByDc zVQyr3R8em|NM&qo0PMZ#dK>L{G z2FZ?^jSkQ)iHY-l_ciY8-6y#p3PYnulA7#fsn_~qu^T893P7Pys9}!TgtAs|j#<=P z;)VZ@`+wT)cKdLDAO3B(+u46Rdk4G!=aFe5&}oG7SruGVnqeXr|Z zb!s>a&ClKDSIu_KCEQ_N7{RNf0MU>Hh|`!k1Vt?75pj{@)7V7;j=U>^7@2uIVoMaw zafEn88R0vKd$WM=ARM?ggt&tPjvN|9B#3Hr3iw1($h)o9j7rR!9<6zfXjFe;__{gs zqIo=tIbo`H)1eDfr*%yx+>1zSfxV!`#ZWjcZ!v56bVhkg7HSBn4Tt)aHN#+5yClnN z%3R*9HIPf4OTuam(}`L`6H0)Luon;pCCLJNeitph;QD`GEv_*m0+Sj-lDa>T;1YZ2 zCof3K&aa7gO}ygb;tP69EXaILg4s0*ipmewH}q3nOAV(S7{JgF6iAk)lPbMVp~jr} zi<+5Zon~jR*{*%+mG*f)if~uhj|qRE4WN?$ciIQ-y>^!Wzvvu3@&Cto$W2H&5v+d; z4M~LN^cqDJ$=4{F6T}I-@*L8H&*DY23<<&<)xBWG2I( z5oM_EQ|!LNJ`Nnh>d+1jTr~B3AE0@`l(GfvK*$T=l|vaLJfwl^1vA8nBR2YBKWG&&uMHUkvm8ltH7&uAoYo=OZ#O9QY>13Lfkt{VybZBFcN8EiRlv1fYfh2 zMFf=2HWJ{wXhs6Uup0dgDo{kgbg=I)Rn6UPBoXQ&MzC90Z_4OGu8WX3AQ-7SO^XWI zN)8Uhz-feBw7@|u8WvriETOD;hi4#O2{3!xNRXl{WR9sfiy1)y&0|BEB9WZ6=tL6U zB~u*xk)A=BS{_fJnpvbkfQ-Ya?-RCzoH>`zEtCw!Uqtc zQ}qp9&pl@j-NjzO(Ir`ODB>oy>XFZzj^JdCEW+tBmt?8Sgv`4V9lRvE6S6%EJ%zq( zXHI#y71$f7i_PFhy6(g-qGo+)zzj4jfpq&vbelHK(9{TG)^wcAS6G#=|#4Mj(ne9 zqh=3>c;fk9ZjkQ9uO87;X{7$_gQ)H_OI^ zy2}Rleiu}0>k80vbK`cZs+G1T*L5;J^0&shVV0~ln5wKjyy%ZVS3>adg!sC${GsX@ zajjd+v&WwPs6{_0lRC4>N=KFiMJ1Ciu3Ln-kZ5?CKdUNI*pVs(5}T0z)k;s$8JiesBtmUo|acmE??g z5((i_341k=#X}m#zLxl;wyHHJ{z4yHIO219Ou( zDO5_R$niZAM76Ej7J3Z_hAs*jji^KYZmT5)sh_)|jbEDRJqH22E0Of36^FAOd3cim z>H^)^chQ8@yJ&6-AQbUKu3lapy0RdqD3S%>5) z_BnyV3KbqPDh{sPM~)ZHg%I{!iIb}Ib`7agW6u4tDrJKj&54lLm{=i<5Oj@~+`?LP zs;17v^1O|%#fjRSz@Wp~V=&Cqx;&oNB_T9CL!jjJ>IG;@h1e^Y4b0D)I=kwVeL@=R z?8N0MS{A9L&yy0>T5^U2ojE8JSj;2j;2lH*e~IuF_Iw~Fu)GfmkPk5DRUc|dR_tNL zq_-r?V#J4&IP^-NhP8ML$1rnZfYT!EC{xAozTjrcaO=3462`aSG^21=mBjQgWZbwP z2swg#uYi9^mbV3eNtT94ztV|jx0R$y%9Rl;DX}rxQdRHRxl-EQXCpQR&8<=;{dB1^ z>gn$r)6S~+P?WpBCTzM%A)uOSvP>Dx# z--{5QPKhH(o@g%2AZWRwh5%l-P-6~g?3bglf6r*_7onj+R%J7Wze9S?hk|I;0OBRx&!q-S7p!>R_e!L(Yxyt}Aq|niB0o1!I+5%w9u?h?)Ml{mb}LPgGxk&aH&rX zaQmO!n?S#vIc5>x0k94Z5cWCLL3R9l%t(C))n^V|gYmukPHhX-`L#Dy*I$(Ly1e)B zBGVNB4mLNcr*(6OVGTvMRy1pdB$8@Em@xHALc+TE3tv%Bsnf*gi|>0JxiRzwBRFum za2EzZXhky8X+8p{u1~K z)C7A9A)$hDQ%UefB6M+tCs;|dQWxmL)r1!9caYa4P0{iapakTKFx`AwblrxnR32V0 zsP8#q;R9{NZed3Kdl+<>D{?ucw_kzCdv)(==FG+SJ#|;0FW_`5yt5wM6utOS1gn z7zre3qH~tJDFS%*(u1imQMWhGt>W9wq=KB<-HyEd%=ShTWJi3}b4=2PE0T$QPbr6m1Qem?Ja*;?b9Jw{@B)tl z@DF_NgQ0M=49WHm3c57X1w10y z&6<6vpZ7W>x_JdVKPm`i5KWX=xed(0uj0V<$s4$ z(WWNWWq>;J!0xTC`>or4(Wt!Rm&2*|JTLfFO4eSWuiQZarDr~fQK>Vqqi?UxU3tDc z-C9An^B=(Hz0=~3jg1zs zuW=A5(YZ*dw%LVbdtkej0D_mvPt6b+rIDN@lr6icm8^F_X@PH|xsdC57j@e5UId8K zP52>=gGk=)SU=LA;aDj4z{7nKIMgL>@|&njP;AcOE)WvTXbruR}BH7aY>d90mV=wGi)=5x9CKy zpO(O=6*4mQZggp99tW4|Qv6_dfA{6fc70>Qz3Bm+#>YpaqiSLy0q_UPE`5sK6PE;$ z7cFfb#P_->X%+|B=3zb$_tbVP&;Z#Uz9m%Kl3YctF;&xCv7kZ!&B<^y_{og+a8C{R zcm1CLU{Q%-zc=WQM2Xy*LTIbB%c39+x+vz2Yr>;OXXSJ;ed{88&CM_U*>n~@=ejQ2 zBY_)IFNoyzPPf%sEaf!dO`kg0H)sbATZXBP0HLi*vh>_8S}frYt6{Og6GKDs?$Qgd z2=k`P42Y|J918)-E?hO;a{OkmV%{od1HOfZh-G4qolwCoB*2XDeFIft5 z$;b^dj3>V5Bt%(+G4l;^0d5LkRboM+Id#>ZKsoQGjt6R8SwFI$wbg6pMTVEif2|QH zXC?_F(0?UEAP;$&judl*qP1@gQK$W`WFe=1)@mTtU&OwzRYND!Ga6km!buR-YFg>z zajl1yHXaCrWrYyUwB|F6eP1$LowS|v0ka%GfKHV$1J z!BsJi$ZV->utT3N!HiSti}JG9^F-gVWA=;fE~*bGScbm`uu?fWAX1f8uNgfK=GJSe zVy_Q=cvpw!wRk7ZaLu8oCQ%(KOuNQbKh>n@mrEw`YzHLM9dwOZ;03cCL>Qw?AT-4h z_G>%! z18eh{cSXv!dru6O*y_DNzxFuP2+);>&3(O?E^m(pug(YKqvLlcXXA^b;qZs^!SQx& zDatgz-M#&Tx~7;mg0iHMyv=jw5Y#mKWmpbU z{S4xv7(IF&2q6mjUT~S%>qrwE^$Dy1k5cC5#)Ladc#HDRqP9TXanNJ-QWbc1&NfRJoJ^NOKl5bK~?NTvUE$G zR@Kt?h*HBlp!*RhGlHEtagk(@{;~#WiB$_mXZ8vn#5|%4@_8?u9n81Rl7UrV!Js2-4$ zWedGOIzmTrG#958M-t*Zl*Yg?OP4hMf)O=YMPboAPFGOISt%WfXw_PUaFiF_%a}ar zW!xhyYO2j4#@3RQ2HJKFj6y~l`f5axSj;@pq-HocdmvS9Xnf=de2^pXLA0D|wOf?TXae{(^jc`sQW$+&1Sr=VN z4`bs=VA*3T6@oJFmzrz6MR-%>lc~C3t07(INLI0~*|*R_0x1N1NdzjuC&im#3d%@) zPUI)WB6t^d;Fr9DdFzSEx;*t3UL@ovWvF6&aK%q>1t7{PWlMB@K^8!q-Gjq-o_^_s zF`QNwHF5He814sG-(x0?My0LpkoX{hDOGbseRb=o3*qThZ0k#-iynsHcy&QtjX^w@DQXS_33OW!S-k%gegz(B-#EJ zYM=$a8D5fWNhi@WT?u%%{*kfn7cHscqOB1C)xzal8i1}?d=-1&`+(!f<5N$ttu8vI zXEYiL4jh99Woru^xvnSZf_+QE%Xk2U)IG{;@5|~M+y9Wdr?%<;mfndx$^^~eG%F@8 zQ=B)XF2Yb#73mp2lUgmYyIHk|JUGZm<98eg2uwR& zhJ?W_VIaNs=iUtT1Iow{=`aH7z{7>;uX?j%+ik^;a`4dxC=Lw*d9TP355?>jC8^`Y zp(o=J2&xOv%-C?C37pvD5OKO7$Q8>P2nlpUKsQBH8c2PZ3_G-gI0fra$s6O@jEHmD zwHG<_WJnA(^c|)kKNIxO=Q(#$gg2vcAg$ei1P%!>^XLj{r6`30s)!ELSYR#Y}4;B)XZ4!DeeA=U16A1qN1!I;2qU-}^SyxR38+R< zQuU($PTyCf!SF~Rzk|HMl{`~WWI@4g3I|D3$~-bLG!x*Pu-(cMUGz~?)l`x<20Lm0 zyi9*pR{?JuGn;HLt&*NRZ_KdDiI$+ zQk8=h2XZszAT=ia?X=Y^p6;Taon+QDEndXFe55S9Yj^LLW>y z@KO07p?uf|4|ef-C~I4DXdi94c*)_+q1c3)Hwaym$(+*5@vn3;Uf`QCBaxU6d%2JE zC<@2YEgDt^jiWBwLtE-jOH6Z^3ph;N=Ry09Z{)IzD7wa;lvpr|FuxS9#PNpDcOZ01 zAb$u30T*ooAGtEea~d-)mmAd7`^5sYOTp0K+HVJ>*K`@d%)KBcic=($&1?s|`+#k> zv9A7*=>}X9-4G|%F{D@=z+S;4xsgS48b>G~*Aff0<(f8J9L#(#nCVtJhc9b|hs^vb zv-p_#7e8nIn;tR?rSD(q#PGAvQTo1&Mv<;Mv`t{^+MQN~h*ui?^J*Sms9DPTH$ zO4aTCoM4wQF0Jw<%g$zi3GGJtVszyX1*0V#9;)ips|jh znwWmpC36{TJjddb3T>1a8)XaWPuh{Y#EK?wJYx)=!Mf=>z3xd&LZww9#BP7hs4^-|ej1+$%n2Akt2UZYWGaeSP8yeF8Dful zZWn#m|LNlBWN@O5xm|M(+iSPm+6mVSr=A}PLQj@m(5$6gEi8s24oP`%KUP|zd^pi9TmbtQfYooAqGZlrP7kh#20Ii?}Tv$594Q@`560s-Liw)rm4B%%gI;dJAGnj~p~w z*MwZkc?ND#ox_)N>v#v&W>?tPvr=}$xVCe3MJNl2qoJ(qvL%a+*jO_TnOi3A0cgy8 zJhNg)jlg<~J2;RT5V9n&#I`L++}=k z!Z2HY5Hnr3&_#91chr}<8n-I~Vp@6Qs)#4UT1*IX=ES)KMTV~3MfLY*-<_TRaJF-L z{=?3@{_)BCcRO!S-n`xE4NgWUy`xjvoK#=E52oHtW=W_^HyMsae$JS!iUna;w`r(- zFj64-r57UUks+@Hm6(*iRMAy!a5FD@8&6;k$sok=J7J6P-m*`YGvWA^s4UfZ>P2Ft zm>xpgixT$Ev+s|0(15t;Esms?eu0CfI_bwDj~Ky=3=pkH)aQTTa2hA6_?LJXdtcQL zl>r5XLOw2#hVgGP2BLV;QZWm6qVuLGKW4D@RkR1#V67|N0HymSdj6p`rwh_j46fCL zN)lkpoyb3$?&QNZMApOVoUxO;^G&=7rCv_n26+p@BfJO^r>dV04v>|+XNhva(_)4G2 zW&36fBC1BEX(rE6K!fFi#>rqRlWjc>89_V-k1~CQ?u&!5SgeO_a~K!-SPFH?rq@I#(;d0H2I823xfmuHT%AS=gognv;f#e%cU{b`9BV%4v(Q zpqhwIr(#rwVirle93jD9LB}mF&53lMKe{+c7Dz;q2Peg;5H~_`Fbf=Q@FMjZTF&_P zXrRPp;5&5Dyjl3ESnP?;)1fZF`WA5xVgI z{XhS&jbDex~{TgTR|kiiYQtTJy3?ojwq_@k_9QM5|hAeDx#!TL7FP#3TIrN)xrHP z2k?p`_4 z$Ow9J)$gEiHvF$snUX{?Bltd^#M7zC1oO@oOF1#hoAonebq?Bl(%gX07enuNqVBvB z4t1XwaEUP#jU#RBhkWmf1cY-ilm8lZKy0^cJ5aiW9!>=&v6-)ELhvT9x{Y*^>P8Bf zaUnY{V#qm`ya~f7xy6!R1Sa#4MqWCgTG$kfX2E!7Mzpj0@||aYNRKImrd)WO=W@E- zZ%dj@B^jr>sNVT%x7j&-*=#pEN%D#=svnrBBG$c7;XP3L-p8Sg9BT%Q>RN}Rm#vq* z6es%>3Cs-7AS&Q_5h zq{cn#!miZ%%5HN`40{Jl>}$*|vrcR>&-RY8txjX#U%y>-9Jy7?(j0egti{DlkQUhs z96598=#TWphS3*UotC(B?k_+!YKFiFgA07)E#ieG$=eq7I@g@*r?%CQQXg~+VzE9K z6X{>%24YLFZF7wDBJ`i%w52V5y1tZb8G#iH*T)NdbK?4>M}xqG3M<18(gWMTv@?Jf z8P-A!wP7L$%Busel(nuW$Y`>&ElNl-RiqVUwTy-wb=tf8D$+TRW=wi+$Q&B7^XDN6 zROi2Hw;x%GtC^^qX&EdN*7HdKyR!fWg#M)FOP_e_-b!Vv(7Vq`;F23Xf&j7Jshje8 zW2z{#9p?G(dN5mGER;1LcSsSH}sK(LJ+F&S)sl!&HDm!_Hi@ecC{{2VPF zH-bp5mb3@sQ%~f#c3tOxQWuyy=#s1t2MeVkG&tx9Dnrqi&y;&#QjfEsa^y-9LVm_; zO^p_l*+M+xySn>0P}u^sCz9B(y~y?n(-$PfMRWS9iY zDm_0usyw7c#_nejR^p!YbdO*NvZm9MCT@YP%af9KT_rE@fyDc0cTd0T`2+_i#)hi1 zzpsxIcTm$VNW?rD!Z>H-m!w_`A=G_K6}B`KFWc=-&fI@h>1-B=Rpsq9ySnt&7V63S z=8(|^iRL8cdiuYU8!&9R4#OeQISduFrlu!Ya)RPQZk}rA_JSECk)&MSe0NZ9aNI-} z^2VGKrKB&=TPC>0|1|V&TI)XbH~Tn8lt;cxxs@9W)>;2XUJVuqfF| zSb^$hsqH2<3?{`$K9@K zkDt4kENH+<^f6(zA4BSX6x$#Vu|qzJ75x!R=clpHNwnSk*B2H%xiM%${yZLwn&a^= zs< z;BTqW=5im!4#dIeqGuiJiyi`1qE?F-&LmSxu2$ij2@%mnzhW{Y5Q~&XAPR5kSBZIU zr@4FhFJNuyTE@Ckl6VY85fMclE3iR;)pgmD&wSK?7Tgk$_=mhl3LI_U0X^WIFkMr5Cj%skiDdBhwC{}VgUyC zJT7DwaqUVP1$8Op{Z2ANkZDEBI%4{2AJ`;qv!uH|3F?8;iJGHp3N`_jp2MNO6bInL z^Ehzm0t6i$rdUQ&Ft4?2x?_14OjR<4Z37k0MA-~PcsT|QDQp)tqAFDm{s$=&Q`kG`*Kw3~tQCgQEL^HG1;jBcX)Yopz6 zw-5LC;oo+y~EBw+MWH*;od(``~FZUe_|of{-b^8wz8f3 zi#+NSk(h0fD~R{A@B-MctxW%xS|Fm@w2L%rqd5scSV<%#uuqLBy7IUuRRIcyj>#UO zKmI_?@4+msY2}4SfBsp^+6V^|6{RH5yqQQ=-*Qt)$4!1b9nF~ zv;Gg-FFH@_|1q9F{%C!PuDnGTP99UwC($w_-z)@Kgsg$SZ2kFXO_ZwjZ$fQ8VBb7I zn!IN12Z)9q$hd3~I^2^E(Z+KWBKm!ognUa>%JTLeuFB=v0K~QD(y{>^pAAJ>uonr5 zv)!yIj2h~Aq1}<20c4A7Bp*TKQD5tZ+lXT4SA;RoCFr9>TA(Zb^cKT-I`wWKm8phA z0vG<4ROo590^Ptg_WdRLEyh0hj*F8DbnY=paxyheDgeYB!(Y) zW+C%}Xo~9p=V-kVj>MB|podniJ+l;5RGwT8*Dl zxeNGe%A~(*0>R9YpCF^A`GCW)i|T*;k$9k|7hn_p`DZ=9aHNINX*K#*8QF(Q6mNw| zu1y?A^oN2bM5wE zZWR@TQ(UT~>dXcmdrjGi%8rolqUgtSFMz-Z#Z+l-D}1*LJG~4^l6~Rx=q+S_xN~0v z@_F`ETc$PVlxHWcH9n@8##)<7*~sM9P7*0kte>(zi^tr7s{9w7|Ec<#Jw9r6UcgtK0?T8 zvKb1t8OwdnYGW*ZyYaTsy33d=yXO1sSz@Dpn~o`jZqX;uJ~z2DCu#lzfiHA}G8}qp zH(&u~OEDm}NmyOIs3Y`TZ=;F?i2<(IFli+JWAz|wNVdJbjZ(eIcBb_uTw)03`(>-V zYuI(!<{f*U434y?%Zmf5r_a##w$%?X3AFlchJHnFO7UN4f^6Q23hJVI9k9#|U~xCi z1bMby%Mz_`axvK&F?_bO``ne^EJ?13(rD{&a%wNA7 z&q5r{#o5&AkC|RAvG_}9ZjHPkyIeJE6}4M;#BtDS-JaS1cRp zzHdW+HeBr*&~_SG3$<43pIrQJjTx!>SW-@|e^Cm?p>dlTB4D)K$=C~Aa`V4D*C#qm z@>pFrezVtJF=1X))}w3#9{UVhOHG`%y%KV!qE$;GOW)Q%d09V7DGsw<5Kn?Ol#KkfnfP|`LB{rk&5--pgU?9A_pAD1~*Si4+FiO-4LrSx(qx8k#p zz+E@!ioA=rvA6Ct^v4_-lk1@7_F4x~CnFqLjmS@TZ$h2e3foZM?%v3+g(8d9l3n0F z`jnqtscz}d_t#V}Dw_>ftoi$B&@Ip)S*<0X@7`3D-JY#>)VI4g5@c^1tVYzgyEmd8 z5=z=hKHt45FMn5LwPe2D1L0&+`QnClivC~Fs^lWg?fe&eMHYRxt~v_7CQGd7t7ecz z-_*n^`jiY)bK7hbkbhqjV?Cy-GRJ>U{aEYw8c2H4Ik+Kn-Zvb=BA!H~SB{-YVmiwP zE1!yfoh>Ad#yc7Z(JEZP@9RRE2CF#oPRygR_}-FP`x`R-yFfgi$fD}aAGup)DG$kb zmykI~Ct5L977%~|;%Q1p(|HtyGUi>`Ewlkrpgy&1AN1BcIvtuj;UYCK7_6;zAt*|& zaUa+I>t!Tl)cDbv~Ak8m;3vBYxV49`(^u9J<~3PtNW!&-b1g} z@6>u-O4!imLzdM2+y}0(mun55)yL0w5S8WX#setpeeQ#o>)l!dr~3B!4q6gNeA8h| zGJo9Tz#XjHzk_!B_B~u{=uH3aZ}1+lcTRMRm1kA{+?QW*KQ|gk(aZZA%LnLVB;&qs zI*KxI^JhMO*}knca1ltkR`+@)i{z*7Xl@@W?d$0LyZ+gDouvVBV}>gh zM@zNZg3={=BB))C(ct9!pT*nnpph(;i*#4*qU@Psg56yGMYm@JXx|Wtw|G^E$d+k68XGGnbNA4df}{g zBnoIiij9nO68~E8sz_^9k;T>|ZI*QAo~U^{!Wp6!IrDrTT~wEQx9Ok?{w22Vg4I!V z_A9$$Xef|tUo{j~Sa*CFc1SNPbC-~=Lpqh0G_&yz_&;JH~qo5e|CIvesVS{>YfVQW8xLrbWzpc z5Bmc_qKfLqAh@9V(VPC+X#DnkI9dV3if~j4Mw}v7f&iUDGFsZrRs%dA^-n8lLL=fA zQv|BMADoUajz(`wtLkV)`KrD1cNc^HaCmZlR$AK%X_N&D&5g~JY;23o zhHsCvrAm2V%m>9bHn&IJHpzJ?+`olITH@tl~Ys({iia7fJ=gA>7ic3a3Xwua+t)`l~ z$&46M0M|q`$n3@U9{)pj&5HjbmNERN;Vha!;4ev1F}C=U)j zHRZbKs#Cl40=J8L5JT@B4r@B%UAKmmMNd(<1*ImJYg&e&=++82l8#Q%L?4kCxFm?s zzNn;Iz+u>QXfW-fkN=V}W5W=nlyB?+@+=O(eCHcTfNO=Do&D~G=o=Y95MKW*3dk6w zLf!>2;~Uun<#;3SOw^6YN})RuW^MyO@TTLV(b21;VShaO=|V7b?alogF!77?;pokv zKm4y#5Wh--TV%Zdn+mj5*~YW1vUIaAsGOD_%K;?L?FB$|KUV=s`x6%c8V*n2ogc4+ zV;px2K)gHpaeQ)o+8_7M&(4PF-NgW~69yH7IKSwhtpZ`v?kEubA4esEYdYqcD68+< zO1he8uT}Z+CNJ^HD?4pEd7Ql2IVsU0}YJ2IfGE9u;dOy8-l z;Cq=H)jY64|G0lPIyuVjmd!Y^HF+D z$I-muVEu2?VNux>nqw~0_0%&4=a#WFlz%%KT?lsd<4+kj1*HWOmImq)cTsv+U7XwH z&(7__`H)@O6`*i6T=WO;PDZ2t@z@N2kf4U+*XIKXR!*}ns=L&=B&;!yCp!}K4*or6 zq=6l_gRgmmIBaJ|>C7jMnZtH|i}7+t)zL$?Bdt^#v$?}|ew{KpYv?e~R3@~{44ls7 zptcl1`CWfBIO!>kXjg@WO5W!cQW^-{m0Id3T_LAQOIJvAXsUvxC7o;OS$!J5e>MDR zIO@Oag1vQ`+NqiI9a$zm0+bO{pE)CML4NQ8mtI4>Xr;m2THs3=*7{8k0(7HmD3e6w zp7_#GKO&Hir-sm*9%#A7Kb)K$pZ_p^d;Wfqk*=U`xhBgPX2CX{RdqGfT}-v32l*oQ z{Ug2%oY#KL=Q=G)T2MF|j80x3^+w~1_ot`hqv20yz47bQ_rtg2eROo-)(7zuAP__PNx4nPZ&gg#*+Xn|v`k%*mZ2b=oL*6n*}mR zhP2|Tpj%mMFO$~t?G^D*lgmx2$WcUp!VABwOuC&Ej|LT;l}s+dVosb(9xqyQ?_c1s zYu`}FP(|ojbEIg|e1$o=5F$@KuYeXu5cCo8Io>@uwT16JanTqYGPB`cd^^?I@kRxT>d^pv|U7|4s`D7lG}CC1|5hzk)9l0CND=EIb~ zVKff)>msc4$r}@L7A1Df^3US>_GO!d^+z@$1}M3N^ed0KJZU!jCFv;0^@^hCBMS0d zFVB-I^GoKW@`}>dMI%J(P1=YETX+Es=NoazxFF17vfABz>y;&|GOg$OLq0 z#z+9ka4;i!pA}C7x&&4!KqhN)$++Y8Vu1~2nA+y#v(aYvENP^(YlAP_gGesAxh|_5 zd(4O%*KxUBTGJyxbnv>FWMe{q{@E=q6XBVSrkQR!U#3+n^UbbSxR@f$qBy)@bV9N= zTCkw3?>4>XQ53!*Q8z_8l`{*6Uh8VN*=~jMoSZx={!h_;e}PRo`iSB%)JG(%8LDEt z7YcD%Z>wgyx=MyRnlr-Z)OWjR@33usSE=2OiI10NJ>*!3O|^m==_bR>;%cWxBsHNB z^1Uk(5YGS36yIHoID&n6PozL_Lwxm`(M8hXhSE#D!{LBT(}YmjsH+b-bqkaf;qD5D z1Xp%_%?RPnY}oG&`lA$dNV}Nslo}?$<~y>?A(SAs@&K29F3Ga1;1*zLT}9qEo-1xO zvm{L6TZLAJlc#fpAGr%J&}L6*a_BD0OP=x3@w=0=bh`2T8lH_&vwFT>_3y|s4WWRU zZeo#~rqIdRs6RM6IvtNrhgwOPCy=E!tOW2~|0htH7eRnq5v9oD+?SHQ5b7_-6seq@gH_H1kjj12pp`l&%_<7Pr;8ZK_G=9k>|YvM!4op? z3P)s}HdN8^C0RB@vM6dV%h+-|SuRnLMP@55mrJh$pJI0vN)E0PwpZU^ryExH)esJB z<#^`rxC@82;PYxsSL|c)Ds*%MA$L~M0cKO_8MGvDTV6shiq%%8 zMqZ)z(n*q2$29Y@Tc!j{swLWkVlE@uL4i&n#RrT8Z!_Bs3afOVJX;mUM+t<~kR4Z@1@R(;gklJUw&9G3; zqif($Xy%!BLv5Du$@PY~WP_~S9`kd)WZX)3->Nm5+gMS;XFj^jatc(6A>ESK++p_!N3|7Swdq7>HRrX0$`)z8=E!fl7Y6efI zUf@O6?xEk@3;2loge4bcvIXnqEgH#P$1#t>ZJCcbPcMSpr~D33TH9**Q`>9Y_fuj2 z6Ef0>!x_UaY5Ynjx3>ja;s3S2+ulvv|LnGRpX`4g=gCSSz_Z_ZGlnDbmiUXelwKmp zwVT)pO>pGQ6GNeI>7>9yXaO)h8i=`bF9typBABt}j83-DXzp?3adbV$k#gMRGBBM! zb;#&+b4o9p=m#&F(>Rg^d@mq7D4G)m>Q_1ukQ^Ft&n1kwD8ww%`OZ~J;wBWX&xyZi z@_9>ut#^^NX7b+~*TkF6qk0$B8wYh`+w^D#K^6hiMh1+)b)3EnJtJ3y)y(euWPh-! z{lOZx0eWz%Zok#au@L<9H{cFkEU;MhKi9RkLq~BJC!QTtZ!D-wzL9f{)PG4ttG~bv z+#M9_C6{-9JuSQKag%yXiAUDe{3`rNAhxoUcm`D(6BZlO%>!`ZTZkgH?&D(s|^Q^;@ z(L9ytg)KwS=L`q#ksr?SS-e11RDv`~Q{m z82*3l&Os-)|F>Usp7#I8cuMwv(62m_08o6^&^n&9cTG<9SE8NS&n$VV?XqHOZe}Jw|FY}zjlkea~rGp|88eL&;R$I`2S-(YdV)EOLu)A&Fr<&>f>dJ708PF{rX+b zotN>1uz*COJG2$~+#Err-2?EG=ZyRodyKfKKAIEs-}Q9#`ItvN{NHs1cTKY3e-!gy zRkrNJXrIX{+m!s3MQb&x3s<$O&y=fMy(G)^TfHR9^3%YRCh#+Oa{OPPXU!jX*8{HL z|Ly(#cJBVa{o;xLKgN^i>PDfF2`~rus`tRp-CVfO`%)Teoy}b}HugpGryie&e%4w4 zcNGJx*MH}rb9k7M|6c4J?mn&m$9Ohe|DdbZB~bU9!ceB>??~D{_I&Iu4BQ+aNrxR8 zMmQqV*dIPJN6DP$G|YksM4g(kQmHUr&Lj1Zv4sq}cQ7X^piG%1k!h~XU}8mxp@MRE z3Ny56^q)#0ry>SV5&kRVzmyfe*BCHgef3q|0!zFs!`#G&y@N5br!A-#nI~ z?n54eStG!<@-5GaaZTG2C%KptSJYEBTTn$`KS6U%G$e&7d}lOe1J;-mf1$JXzBo8E zjZ7&+3(5#`NrXMWX+B&Nw7^Tm$bw!G;iCS-;^54E=)s z$NxY-qyIn+x1!Pv<_?ryT)G}ZjRk7IXt!5Z5f!e=OMSTtKns2R2zeRmzpQ3Rsg=;w zqkIdW!&`t}<(F7y{Fcm3v!jSVQs!c|9b5^yQss?3+#i1=GFMZ*O;FmBjI^$}ejRZV z?I41kxs1Y#70P0z0}905fdn{G?S&RGj}Q}E4EL^xzeLWQUI)*&K_}?U7t|Gh`#!LR zspk_8Uo;2u2uB_mN<#tJmO%~ds~sG3Fvcb*>8}u|D2wFldWNa3nvZkL(M$=9&yoxOa+rGV7V*~0xy_Jc5HEC%n=D_Jeyl>h}Ovsabm@a71Jo>fk`di zAOVjV`J1vsn24w`K>Hq(BCGpjGtYS)DeOr{4Hyy ztQrc2*Vd`Z@)J`rM)5XLld(cT#Lop3g4-sc*fW9{sFy|9e+E z@Rjx-hcB}CzX!Wd{$G#s+>iZ7nYsAGUDs+}o-&P=2EYgVd%O2(+MBxUe5gF!pX$l2 ze{v(JNSOJf;Vc>?xOzDIuf5%agRK46-qZSjoM)v${>BNy3)j4!OmfYO`E<*5pK%a{ z+?J_u;95%lt7W)cFU7BNl=+gbEul;A!VSID6t$!@3en(Hil5#-yfY;f$RAM2Pa~CyTTdzR%Fmj zm#`9PYT!v3lLB{*w71_DgtSkA$>B2ol}^U0&R8rx9%6@Ns|lK(zZY|4@37srpqj|| zy|?|+WbZ{;9a6YyC>81I({WZZ^(r#e7ds$XFibA}&2!~vA#9#7KMUdZS@W}yj$f?< zr#Nwb7S?UE=V#&EHido>oXzv-D?a%*lDa;hXASx9&Urvr*#CC+c01Yg-;2(Z|L>zb z8_9onOc0tD0`J94*KE3#i9*f3zhSaatKO$b7-~rrk73knnk$G(tt81xquzpYn;7-3 z>52H1=JIjVT-u|$($u-E@Fz=mX%M=DmGcT1e?jAB)1ysonsYrfkVP35<{dr1X#^v-b>Ez`LL=bK~<|ls@_9D)m7nC%ZRXM zg1>b$58g-TH_AD9`;3EYNFAHo>`ISG))2aQgL$m80)Q5x^} z)dWESA<|N^cLZ(`(rEx%5wE$lv}~5sY`wU~)d^8H;KZ8@&}WvZ<$mV$ZBwuqmhkY_ zbcta8U`BM7#Qu=BbBWA!Ta&rf5K?^n@0y_HfuA+>zYiY&<;8v{d;h<`yZ5C3eT?UJ z_x~FOh`tZCZ$Z45Pa9`AFS>3XW4P=jbH}hX=|5MD|2pgcq3!<;US#9HzId_sWdHLh z&u!QLMizg0f%LvC{_Z(YXo05Z-pmLso#AIBtK`tL}gI5BGBUANHT( zzdg#6xBt~iXqEM^O2MjQKdBdX=%;j$<0MQ}=4skTEqk8Mhy5(+=Du_eRl)|A`QBoUK>C)3z(C|6=6NP2r(n5{-2#@XTQ;|=hHIlxp)~*h>|EEEptZ3 z5E63$F%nu=oe7C>CpE_ln)~W5%>^X7rtH!SX3fi&5Cb^Z>KZj{;z$WeCBI%j$Z;ms z^)2J*dsD-ro2laI`}&eHd3Z*_lQGrE0m4PM{rd%){R+KfF!O?&)W9W?nJ3t}B!Sxq z8I7nz{VuA5d3L?vB(^CZL@02=R?JC*kr}z^s!ZXwTI*RsPIgfV!tFC6edu!)^QWOIPc$*q23&;JzR4FM>R zWF&uG0^aC@fQ@>-XbyYxgT=n~gB4?`)!BmiB{oU-!F04@J=A{tO}#_d_abVVr?u)< zsL8cc8Cr(Zx5)2cqiOF?pE;^(XZ*~uOmEDeJF;nk;4{b863*_5sRXq-uCiVMws}A9 zRm?#A9)aTXf|03rvqpc4tTomi2c;Ov8VAIS31JV!ME*uyEMPu=qu!M>t-n(z%bDHZ zsFx*7@&S8T!b>;rV>NTlT}H1E9=q#HjT_vk{I#A^{qMbH|6QH`somMl>VNm1^uLeu zBuD1lVFt$$eIrxBrcP+v>X>VE!bQ1jt*o`O3}KNfHS}fyaUq>-$uZqpih<{&=f20+ zD7y^}3T*Bx@zmXQGOLnI*%_aJMpbEc?Lq5vM>ExKLz~1$mi)! zZLHw``-ko9{ojjr`{0THKgRPQUU#LtLSjmq-5w|-y)#iEw+$)rcspITXgASNT!ky%M|I)`_v zF;Tp*H3`RR4qoKjlM-}ElSWS8&XzB1)4;Nt)$dX*!+p`;BNgO|O!(>jTu#*Ww{%s$ zY*&8>GA5JyGbbi2v$aVnOFt$dP0Ibxn~aiytW8H%{4oh>&iJ1*84X)po03V5QeqbD z#S!zamXJY^@s75)0W$5<0>?IAW5%0{?Y zq4Y`RznuJ^YzWq$cZ&hILjK=ToV902}m=`)8w*qti@iF}*VwdBb5uP|w3YH_^oaS`DFZ&tGYZ{Lp{(_Wb<2@wex% zAPm=_KN@7h8d|boKqGJJIbdnhye5-5rI!$JZh>#cj6_VwJS=Ge0xkAVPx@ygD+Jw! zZOx-796P>8f@rK#dgzY*?ZQ8iVG-%Hzpw@wIP*y|Kr8Upg(?l{(g{&8mCaX2|Y&M(wOlI;!=j5 z3*pLEW=M=Op^mpRpH0wyXzdg)3DdFnP6C(QY*)k8PCz-h#yhAKZjQDT`TMqW7#Qv+wBn1ay=W?z*>FkETY}_ z;gqqe{3TiDtWU+yYsxMO8;6wo8Ugt#9VgG~^a9^}OD8|bLdmtgwgo_S;4>OI_>lsy z-^HwKTvkQDO^ga4ux(dYERK6?Wj%C#qQ!+Vhqyakw0EfD2#Lx*oz1MMOtvgB^?XZ; zu;}qCot(;QC>JH6{`%y!pCACCd{T5ZfqXuqI1CB1%^*05A}^TnF4{u9m`8Ns{Z3r- z8qq0|_*!NXVuKjF9y1xQ=nQ5;f&;%MBqXUoSgwkmTsGpem7%O?g<3{iE?)AK@yAMx zRr4v!4l&`XkS>e*0OMli4A^jNj$hq+WFClyl^x}gOXFzsZVpGsnasuxNeqoLC9STcZI4RbG3^>w=&dbHhACwbf#p{^L5Z}BP-cPO6OkCf z)^yl{mKXR&X4#D>y2f4vC}9*~ekoo}y};x19WlCbAb${7<+v6nsW^0TM8l=bIxadav(-YXz(A+EMLZJR{@RP?;@lRHYl*kR2#!pyK+%kggPHFIv$gR`SNPkR zWIgJ$ru=`W7|<*HfA{wfbNN5^Up(pm9_6`Zc;|;a1)#Lwyrs#g4Dy`f6&r)YF@z~!k)_8jDu8cNbUi_2A z8&8?j+&bd;N+^H)^$j#&*^sV?Ql2aM3FDOG&}&_FTH<)hQ{Sa}IK}y@bjSr7BXm2Ja@H^E z69hv4ixOqGnkMDUdGoN+g_X+#OKX^^=;z7$0_%ohzc=WQQiLiA-d!EO`xefHNZ%+( zxYoDL;y5Qgf{c4-N2lY_sYwNx?^-HEMg@TH`aeNd!XgN(??6^T@AU_x+k$skv*7{w~0KzCQmMoKcAN%8kvaZ`MB=({5My>_Kj0K zk);d1TJ1G_Ix7nwZ{Ii-LAK3%2;*?eEY21B??}cF@A=qU>D zU6SPvdM1r6y5E={Wx_d1?g6FIpMOeUAz3HoOH^dCY^m~XI%*AsQi;_s2}y!k&WXQh z@_9=aYJ^IuCQ4=7d64^A>^Ow;chn`ki)zROXw>8}pY;W;(Yqi}!~7N#o}4LoM447S zY7pG}oumk5KFGqrz4I5a^+vs-r2R&vSF)@rjc}ANW+PV8eo^$v&tXSdlmFXyc^kK} zg8#Q)>}Ku1J9`ID@qZrWxd*?_douedNb!<#FOu5Q@_RDS9a(1|h6DG=59jzSUZBq5 zc8Le)ANlMpYb&X$)Mu;JUSU;!nYEpEzQtrlSSA(B`s2Uu`hQ6Iud~1VWdHSvp8H7e za!(9kRe~25V75ec@TO?kZNjTYksDy8GGeVusj`5I5oR+I-CBoQ?e3?Wx%d1w1qRh6 z)?{}~c4G;JpL&KrJyp+|{QpjIz*h19-GdzeKX~&0dz@!YtGL4C3M-7u(EW!E`J~Z` zo{NL2$B2vSqd7tUT~7xziFwq+|6NBON4nsD6z@c;Y?(xA2O+6!)81oPv{uvUDpeTh zs3z-Ta7mV%VsJ^8#TXQxkw5iH`FlP&{;xy@{jZSx7c{t25Xcq$f49B2pXLAJ)f4}J zgr|W2XNA%1d$oMu(ZGu+v$qJF+b`s2FPMQ166H;YE?U_mh61vtZgv{`eqal`is2Vo zr`ZfYsK`fD(ktw`UgXgL`&G^c>sDTws^?cafui7qlSzFfdR#-IMo2wnYtc|L{)R_` z_4*F%`U?BHmi}FMq*zfmb9XnV0cFbC6-6x0IeL_Um9GZ`Misn_Q;w?E2YHzo`sn$3 zW0i-T4AypGV%^o)vOJzFi{VFlfZ7vd)s_MS1ki10VkzJcu73x zoZ0v`+#PQmil#8imYBYG$uw`8fMkSX9hew2I*JOT4&j_|aDMq3K82o(TG1ku%cmK7 z?$pvxE zu`&%{6((&$-Q`#iMW%NFl(L_`HYPFjCRaFlsf$f9kDQs8Eoi?s=wI`E!Q`bb#tXpl zEUd^0#{qSTkC)JK^?D0MbB~L2W<0)ke96_`PckIx`#0!XvzWDi>cr%8O>c4cKF|wc$ z8DrOFsDZvPXns+DriP%7p797rF-Ol}E>4ya;bSgVUaB|@10z$y2&*IYJLZIq@r(pf z-7c+RL%<*OOjB#j2oGt%iFzM;A^E}#r?fv9`*em{F1c#Sm@AnMn$im#B8kI|AjLIi zE^)^YbP7Goze)y3-$a&F{@N6**X6&8Yvu+)k94VNarhc9Jb&5r!mIsM$UrrSU^aqY zwqLft&f0NS7%W>*4~tBe71*D<-Cw$euu&?^k?6x1qHl6Ur_-eLmRYMfSR&tBco8gS zd__GMqA;TU&K|6CAF~;e-eM>YeTv=0VpOrY1-_B24opPaW*9{~N3M&&2>{Irb_q)= zW7i$acj(8)Ylau3aUM$keB3|#>Fc6`;4>OTjiK@(ZD?zpDb&Y-LwH0PM_&XqAYari zRK%izcquJwR5cq4G3Q`XqBhY#|LnF}a>cg3&XwjQ(g?k!T+BAgqsn4GHU_lTmgjk?Ae^llZ^fVoAKOK_H=o?Lnq}tQe z_}fm64X4Bti@qnqUv<)yXC#VQfcD$_t19kpHe^@3YmJ!@;{NgjcfaG7pb@wxLibng zb`c<4QlfAOwFSaP;+bS%vW> zSr%5hB+HcIct9MwSdhR~V(^sFg-q+vZM7I)EF}!4+*SYX+KzUjT|T7Sy-gW=J?hHsB{4-UJTpZ{^xA9i+M+SugcMcD0p@gMl?{po4Q7U~6wqJ0UsPWz0O16;7^^v>o3~YBw!#b&?I1qKjJVz5@U+`$FH$4@SXU9o zsx}L~(?y&Rbi#Q|&{k*v0Ihu5~lz0L}}gond!J+ihBT807_14$uZ4`y)fxrA3!3dE0({;_0PJYu#^r%zk z>1yX`8r{bw7P%F9raZU1{JKFyLW3~U^i^Kg){-@62 zi@k%V`=7^nboiSUS3gOc-85lq~2}A%uu>gX;P>M%)TW1^f-x^ zWLp{5s4lds(=BBSZJueVAOKVG^`gQ14vCpcy_?Dt6ct6ry>Ap&B}poaR!e@%-?HL3 zqHjphBP@DN*_m2t+bZyWVJ|k#_awWpBHvOD^Rnr+GS5$8$u&~^6gGH=v^-S+awBx- z%t8tMKI^*|^vQKgg88>f(vvXV&GYl<&A}RZ89pUV&lPET>_RdlPdyFOPRUcR z%*j(vO}1xa)cpo=5}_ulYh#c4+tKKvZsn{hC>z3kbX|zq`I6RJuHGS5Au&wDuE1k| ze=me_MJ-H3;Fuy8GW+#%9Ht& zaI0)S5#1`}{Mj_Q$f`sgVo6kd-QV9U|GIB~txnsqGFOM(`x6@}tEfq)QSf!6^=ptx zuIg7}B+8br(vsX0>nEI8eTvzzmsNe-Jo!Q7bGhqVB46q5UNW5@KJkE(6&@_-fEFSi zGTnd@MsJ&GU`6#uj}Bd;|FLBIySK3_{@=liPFDZZ-rIfB|2)QXr-LMjO%4`v(~JbY zBVD!O;5ynnJV?p}U=W-QC1>$R(OA==iv~qM9mSxo&M*H9{)GShukHVCZvV0O=XzzI zeE?dUkkQY??xKcg=*U)w0~d>Ab;l(`6m0HO)iRtF1|g})=qlCoAb z#b*w#f|}O4tmupAfYqPRvM--$IKxu@FGDom%LcH5|L^bay~y(a-S$)b|3`TgW1=jT zHav9);P^3*2s^o`ZumSCsK7c3)v12M%HNDt4WXKAsOfTY_M+;pkU(QX5q% z`39@gYz0ZBW?)3JTWkPEEVTgUGQt$(lqonZmW2zHdrVJ*FAkb64)C?)aGC8R)M$!A z7pX(J9ogI*I@dnf*p2hGTIUtb>vLnNrprZ@3i`ak z#7uEOGdb-Wg>?A^S(xT=j%fEYt(7)?rXnlly$4Vm1FhV zuGJekSFi0}y{3b8#^|!budwiLb>sMhC^4d}@JKF5lazKSEfBxfK@y3)^c-2CDv?3qp{lN`j%_@^IOlA7?ll+W#SD+@qX6503k+cgb-@QoV8#mlx|fl znsiCA58kMMU`-`|W(&&A)VlXxcnf*DsL;L z^b352xx>6LO1-{mSRVk=&B9NY$p8Kq;|hbMavIabm*M|s@7J1f1*X}cx6^3-HkSP%(GD3b&W0Bx&EC!&9&Bj#a#WM1Y|&JWBl zbl^sUH;JTVrgZ!7&SZoul5@SgV@p3VpF?EB;b^IV9V@oC*JT5@FT{% z6x~4&yO5);vMHGOgfGp{wonhsAgvEl zJuVLH&=-5n$d34}FA>_IKWl~9je1TgSSsiTF_3#R`a(P3QKv?zqZR_U+f3v^-3HGG35=q;Rlu(rsVLcL(YxB!%6 z+0sal;-(csJ=FJYY|KURimec;vapBd!5+HXm7_g$Ki^cihed+x$9u##hJ|)TJF_I< zBh^Ype5Cud13nhUdz7GTeJ}jni#6Qv^}B2J!>57n>-jj!o+E%Q8s0E*ZW{r2O>ZJ2BS(E>MOe&8`9Hw<&x zG<0Lx`y1)DP^SM`rvvb^_>bM!Is5@SU% zEj$gB(SM^^TE`g6=>PtHHvZ%7+x^!q{eKFmsGm&){_1MZ1pyu<@py%|O9g(p;iaQU z`fW5qG(cQ@5D|DEyP{bUUb)akdsduAj32?$n8kv&+Y18FDvfC_1IjB6n>1fEvI%{w zGV(2&)fxE~&5B2U@`&daY{=1nid@W|H2!b*&D%Fw{(tXX8~^ttkf-Vr0pj$3>L72G zmuV`O6^e+t?0l8zYGdvxV7cGD{{HXls1W1`f3HX*xfg|hR{AxGoLW9vu)vE=-} zd-o>G|9!u=`=&krPXTq#zYJEBKig4ip&$v2qrgGQ-~4B(+CB0h_EnEL3X=9V8EAwX zR8G{eGASuM?s->}y%({ywOpy2p3GzVj;LuqOaNr^e{b{ ztuh8D_rSVo%zXJJxf*Gf?_>ZpRuc!i8EdTHC zzTMx?%KvX)xAOm!zdkyF&H!*{rnuWvtfEIInfeiy2E!whGjxYM zuyqenUj zqIMAt`S0X&p%Pn@{7hzi*{)~(oYuH#>9pvb_{T--qMA|!JwGi4LC-JhG}p4?=T97F zef-3+aCH<(0WdY##9=-4ykPQWl12_!Wj7H+p9sD62y{;c$w;xm0NkRP*kbL18sA|P zhjnk!toIuuLHW1l*HesGij)g*df|H&$CYK9C2x?5+|dv7;}y2AxS#B`wVmv>&B9D1 zy|o8puY2mTJy6lMv)ARjp6?9>Zb)#z(}-*TQZkLA7b~nWd)-5ULuVmR3+nPwZm5E$ z)yB9*Gwfzi6uY_pbIq#tE|rz(;_LEBuK#?)@&SZURPb)<(Jc;jAzORw_-TIp!WXK2 z*(wSE)RWvG`G(a7sB_fHnpYdC2{BppT16~Te>!OiE9M~N^ZbsLyi{#SKk_&Z zA>|GUXN3z^+#)xPDx#>DHP<6{^C9=Po>sXSN=xj@j{Bm_`zxsM3^m#62?+eIAW}T-zLl`sB>(0(TyOQSCe=|%jF`EXjLS% z6w5iOK6}|;8VWz+Rbw$p(<1dOKZT;!6$h#+W|g$9I7&59sJLatA?gs%()Ja{Y9c8t zd~dl4L#Fylj*kath~i*O(%uo`#+AH;W3`P!k3ct!=mZB7+uo70`6-P|PrY!X-zd&3 zs2?7PYuPURmiNsl?lh&}jIsL;dX?TbjniGYbVj4B3rleas%iT5yn;COq0+A<+uYtF z7kP+V>t3`(Vzb2lC#_t}M6)!q=!d4Y8AEP$Y~6ERy1>z`Cw?y~e20DqTe8K!G8Awe zAa5&QS4vyIOzgjH&eJb_gp4CPKqY~2ssrCNS`;%4fIC{$i932vXg_7WNPkg4xU@x< zd_@QuyC>9Dg|Y0+KIWH2qg!t;_yUTc%dwA0#1FvUt~rnQ6mwMY+{MrR3nO#BWJnYGLbJG)tBe2iT8%nbV1TY_GRpw!7cSlCyUh z0uE|D69(mO`pY#_3fL-tO-16|bXI3+kVyT%Ie})@DmPh%QbS z8@5M~VW%s9e371Z+KQmMlTCCUOu;I~$Bktdz#)DJIUZq8y5^{MlHS3+G7|oxVE5vc z^0DiB=pNFXAC|P4XI!vd43HaWh@w%+za?hIce~vpj9WlNO;+y% zuq88wD-W44T_8mMa-+sG8z{)_0oYnbXpP5>+^EH^Z_#Y)MG?)&%rP}ZyNZgnSRR?& zEVtF0;mxP%3C6QZR(NZ}LKiFe|G1&Ingh^c|DV_UZ{KF?zkdJyew+W}NuaU!$YQ^d zb*7bFi*pgkMz&~&nuV!lEe^C+a#`!W()6;NLXIYyJ%|;CriUnWAx8t}+J;^Rgx#ZF956TGB{E90t`hA`#Y)k%CC&uE35tEIk} zMfqNH0~(Q``Dj)Z@ERj_e|xlQg#UOIM04T-e8-n;285 zzv$7T33E#j5BW`{GEQBs^^+N=yqQ5s*k#N?=|7f6UKYRb$ibJ-CLeAEMJxCQ(gLrt z3^jvLv-s8|4z;|G@=#RMHKY@E06uTYQdC==1uBVOEuG`tdrEv;6Q@|7J{qStua-Qf zAhSY?eY)A}IId3J5%#AonU$TBwfP_gODdyvGoLes3~X7SYzC&}VV2-5OHW_T^TXBE z<;`XP;@^Log5cTjnfF_za{nZPba_JTpnJ1$iH3LbW_;x(MkWRNyoMY zsj%a#{`KJM=IF3)=PEZ{jjdRGQdC&Tq7$j+-aq;Aba2)Gx$x3me1(I$y9+ul|&_$x(- zZ5J(#jtQ%>S%u+a)^^nlFRS(~4*VesTn`Q6B&S7Rp%w03qbYOBa)PLRy>TMOW%=M8 z@fY#C4(yKPIH`NY#>KifOa*f_DAZpUy~xYV%b?JHTy;ltHs9okr++E=+{G(Uymdvg zj&AsKLXgXK+PQJFhuq<#@qx)374$x;90YE5EG zZc!aVQSMLxBb2B~Ltm+`<9X}5z%x~NJ&|6dBx7v3E;wJj^Ur*4s)VjnB-a^wY~gjXtN>_Q zXe-iC|M_P@uwbU!#?vdqv^gVSMsKcQI>a+V{`(b>iI@%#S8`PE|l zNtuI|r%+fA!&4SSQ4ru)EP6ggN_yjC`-sWtW1rf`O+#-Sz?&zaU)IB)&%UBzh4{bl z&UwuEzumoe@3Qs3zyE%}t^fBVu;32N)PDVoL5RA=zw}$(bO4R1uu#O{Zm-Olt60O! zq8Vk&7*?$|mSJ2n!CrqZs>EPOX1*9hg+dH}7L>0jSsi21)E4)xTZF>+YMvs`@3HBQ zY19q1&0e(1j`Ii+mZ^#nFMx?~u$Ct&9U;5RR947VRmfCSFk(TRb?MKz*o65hUE<+I zn%&XGCQ93umYPU2!ue+D>6OeOwZZv_isa9ApZ^N<-wKLrHpUYA|K{~>CjNVW_sw2Q z|DOcbP@sD)@!2W@`XYqCM<}iYVdb9>$#l_p{gdpgxd~hh2FdUi%`VQu8WZj%6KQUk>2|wi zmCKvoa3Ts6oLP-WzS0%i8+G*V+&vg zOvC?DO!jr#GKG|OieEma#X|E+1KTew8r@V4sW$p8n$;U!Y7L4;e-eFn3u#zR|E2r! zN+qC|(Er`ndpZ68{_8gX>yyBG>p!Pr2UjQoE#oAzgK!ERbQ0V#t7JnwV5O_kv!9O9IAbOc9q4K3ybMqi~{yD{WGxguq zE&mFZo&UFc-)H5&{nxGj?@1t|JCgfuOMUg|LlJq9UB)V`)}T4&i}i& z?^^!1vOS7#w@9&kZrV5A%(hi4N5qgHo^asCHS{@pjm4F7=f1N^)GB$A*p{Z z3}xNf?U#Mr3aR`Tb&xw;YpPpNIV-=KT-}uXx$RKhd{b%m6M9=c$9`hyH8+ESd}ctk zq)T!E+Kn>V{~G82TY!W>m+ZqHniN&W1ps;;xxX|`PM8BdU3D+pHkI@%ov+GV&=rzZ zfn^D+K>egu**^1$tCn_Jkh}^kPGAL^C9x`r%}s{d8XO&-pP%$^&MtnuIXn6JW z)S?1=DeKdMzOVYHKmT%bba?dPb|NWE8 zi~iN1_6XwiP|hliaeVT_^^Z3nFOE-^FOxcavcjv3i>bF-KVP4n-(3B2S$Uwl$O~j$ z&wArroqjyIxW1}7imoMGbC4fTuRdJ=aC3F>)5&?^NckjEU`Zk=urN7ZnupJVG?H3c zf-0XdIQjXce|q&x)rDf{4hbSzbEQsyJiq9l++3f(KmGTUtlm6A|`_rSttCPATrSn=< zzp_>Q(sjT1%Kic*)#!B>PkV4BDBOll{+|~=-2C_Jlk4aF0VU#B#e9ZJswu?5OiDw0 zfnbPb=9IXyy@3i@4@)VF)m3rE!({wSs>4ibxjfgGYTGP*p{D-%+=W1=1iuKpSzfTI zOCVDsVR`1ig}MK-;$-3OK33j0m6vwN69Y!ivPB`98) zCH-w$CN9k!FFz!b@l;n+irAERZaT+00Aq-~h$8!UyMyxN^G~~UVjj!qtnYVO4`oIthUJ|6i+G$V(Ebq}OXpTsg_zUzU+i>-3BEZ)u-3Qxh&8V_6=o60YI#vr=gt^P{Dt zGRo)2%txgS7fq8y@KHRZmqz zLF3jn;y_y_@Nq!X|K1dNzA^!?e~e}P-|qKW`oI6~T^s-PB+#2+K8;2@uU@#sVLPv0 zhzI(A3Ljn^U7TO_Pk*?+Iz9if=esXBVtnV-m!5bFYXN=!&rXj{&Ic!tGscqmk9T{o z-)7GL-rKjk?fHKS0L$Pogw7O!Gwh%s45&pW&h&% z`ba$P$X3Uv15K?i&SeLCJ#dVq8W@v+^9NG5JK}4^(J-2t2c2SyBucDfh!lUxA`d>Ft95}PN+Wsx)06YGHcDUzQ* znyJ}C*|)ti_gG*Pq2MLP+iH8*6o;axF&^_72oZHe*Dv4h{>!!;j!>i*-gFdk#$n)! zJz!Hv5i>pFZ7@Os8e<1TFWtK}&t%JgA<>q!B8tE0*0#OtFpz6rLfu^62bz{r^23-nToYTytTb>g!pJ2Dz_*`Q<2{}@jqW!(X?#6U9j zi_ve$;rXegAB&PEl_r`cY@sM=pjyh{M)reZI_ zV)CXXeOHVv$O`A;ZjmcwW~;k+2?Ky0pdWfjyckk)hxLo1ggkP;ovgw! zlI4f+9RgxO*j5$;#2CeEpub-Cq}ISpd<2=;yg(jBSBxRBpAuiuDlwGYE^!v_r`VZV z!~nUN6Dp27MR!=bDc5&=;f`m|KzwAa@!|#42hQB3 z@jOIlsXdW6>}pOVwmPe|k#7-NI{A)uD7c{dB!Hf0$To{cKIWQu7`{Vdmz=qro<0h4 zAW6q_Y=zlndEG6%Eo??bP-Qv1!1ocFLT?PnxSV;ZcH4uk_?wLVQr-74Stes3_4AYj z*y)H}7(q|s(LELK1(NxQ0=@b`oC15%QL<2Coj6Mli(G%!S$Gx2w96iY1lF8@53wg+ z_AukDV_#V@E2K)@Fq?#9#v&xH5J%pTx`o<)aq}r|CFZs4MekT-B!vamYKwJqF>@j& zZ+SVQFX^RbBR@%smt0Ng!7M`hTMa%sBw!(SA`&rg27E|w1?i&+cVt*D#PB4Lv>yj@ zkL1D@Vxk~cTjzuW2<)@k+sYr|41XPewmE@ISsr@<1%320gUUFw5kdi=$U%~lk7lWH zl0(SQ?-2^PCx&$h4T-w01;c9{KShZ4d*DaGR*7Mc;?Fmn6&OV7a@Dw6D9l*L%%;i+ zI#XaR5D+9}G*euhSnzoSFywh1{a@^dgmSepF&)s1vgQgUnK54` zmO$;185M@1C&Wz>cr&%if_CYtNmngaq*$KLF~z~eNHhqW zyU#xOFWEML9tn`X5gp=>a1e9#^0n*>=7W@kt8ZIQG?SN}oF3v{Y=yb&df;>{_CJ<| z7{^@Tbi64XPt+9P1d5*}k<)_v%jCj}d231->&gWapCMzl5mo=j0f4}R_bkF(e5!{g z>JorFo_xX+WT@gI0w?bTHF2gz?W7+k*_@gAEVCcJ*cY=Fxf;$94NciS?-+Sx+`KnIU z@viRE-DmH$wlu5UEMz95=N3z^R-anKaEBd@LsgK1YshJx^%PVtTk?tNkn z+39$}XCWn!Q5uFY<4}03!dwxuaqcETzX1Ik`2hLd#2q{Cyrd^N)tKp1jJE|=UuB7s zFq87r5@73xJU60lb(h{Uoj4{#Zc8oC^O3IH_;pg*&N}74;rf_Gb92deF=$j zZL%&Zs~GE4=77bcvbt(XsBK zn2zHvQL9RXghQ3v;$g zn$-r1f;6TSv!27-+GFnpNh75+cI0}@jkHKD(PENb zr@U;SS;l5XLxCnY=1J>p+|tpw`5GjzivuZZoEYh#L^j3^w$z7cz!<2fx(4s-@l}19 zGRUQ2$56}oBLFq8{1=9@TqVV%uIvbM(+T6K4M*6pK@`Zs;b^aj@eiSl(R!B^qOgO` zDM@_$$B3usR1%*Q&B>u8ML7b9)0h$Kxt&sAk`5sk?4i$dhi>Gcv>;-35Qk*1?tG3H zHuM~4kQVbT#UPEmO4~El<=JAWnqI!am%-?du{{5RV_HsW70;S% zYM5oBkAlxWa)BLUMI*blHLeq;&k9g49AF;IVd(!&iSh6t`mlvV+G4j^N~PiLNG#y< z5J!Btr}7AU{;L9LR;ZesqWB%(C8Hq=XX(hLz2$E)82-t(@)mxJoF~}Kfujq8@epOS zyf3>&0Z`4wM8ZKec}?&$1(7kpzNF_W$a1RqIJDgE0bR3!tLX`ENQ-JZ1%aK(na+aA zO7gOh$b^7XpJk2v^DhHl9Rp!PDcdY!jf>@sru&~Cf%KdKMiD?4kyS(qN*q;G8&^22 z{M^>ogP4c&=kMTM)j~3$?RdlHcg*9?^~;;#Wo7mLTy zlYBMpju){ut4fj(@u!pZc~SJr^lVwETmoFT#KgXAONhPR9PE$()CMh#`+^N#wX>!;OT5wQ;O_vay#Xa5d|cVvIGOc);1sg2olFaieW zPiZ;%6xo!EFtKD5rK6GkxFmeA=quP$pVHNhl}szY#l?bqQgpD|N0c?aRebZJz1fBE1AUYDPW>|yl8@%vcv<9ZW{Evd z8iy*VRR;x-<>M2Ki0b5R;o!|uG7Ag%*Kv{$U0an<2hC!1gyuFaoB1RoD%ss&g9_M}EPz4$_ulPc{iz9$v??Hux;|0Dl{sc*aJ@z1m+C}p`MW1^Jt*0_If^lo-O z$kWNF#lTf}m1F0cP9RjVz(gei;u-UkBROH1Lw_ufOd!Z!K2_E-M9curP@_zK|yiH}J^d-A0_&j5>YB;gz zn|WfMX0JXHR5untF=E8Efl#nWgq5V!ViQZX({D!5kB&&_7GVc_IA2N^L;eRbN* z^Zq-{x7RPP2iH&g3g5kHEMvp|y*h7Sb_XQKyskN&Nr++lql(jhN0rxtl$_xD!_aQ_ zhO6|BLK(cSPgA?VpU05)B?`G+N+$o4HF_EuTDb+(sBfCO| z6K2f(6089d3A5ajRa~eueS>|^Qt`HZ5KlSrh<#gtK~8FXrpiRJ5relN++yH?Em?g` zx#I(ZxLTw*Ji|b5PYU1$_5FLck*XuSFDwf-e}-eOdVpns1mdCRJ8{f!pmVyY*dO@r z+soVZ0>r+#K26WZ6X`o;ZSp%liG6(iW}k3wm~fwk1^yP9n%V@<9mEq`xTpoJF@bL{ zZ88{s?SWg(IOETmx_Z0ES_%M;5*~WRj$Kis{cbIgJdFvz|O>hG$ zOJ7|19xR#6K`ivt$c<}kxZxS8b+1C9A$sS2o|RR3&C0FX{SF~04;1rq$~LJ%}TFvDjN zMbWbbPRoqf-^VXwsekm$_6cRbTzf>836KB-&=|fC_FJ*UW-NADmWU&Kmf=ZpI6S)A zx_tdyhhcbC&ezVc?o1I!H$;6lz9gi%?dr?Ayni5-31qq}@!XQVZK%}AQNhkJ`PDa< zf>+vt$Ct{a?Q3AYovx^KtZXR{-4LOuv(&3CVsFyp$cQ1z19!f@4vgu8-1uj>SbZ7V+QSupes&b)b39k(KQzllV~o5peFcZjidoCQ&~h=<0a0 zYS^J3J(YBRJSeI?>R8@EYDm!HQ>~sH+ppfev0&RH$Q0X@tDmtO%(KU!=}t7-wL;i< zR)}wbWGECU>9tZ~_*E^KNDLz~h9uT(|Dc{>+{>PEjDR!3Hw}a_gpAlf_j`Agu)-q0 z_O=Y`T_a=7I~j&j=Ajex2IX7meZbA0ha;Yr$TVh}tTC2dG*BcIkSPmHOJVCEQB-$vb=Lnz#)8xezkARd)M8@zFA*uAv~`pT1nNWG-_cSX#VE*Go!WMBMS_&u)T0q zK9WfzH#P}0&M!$7bOxz|9SQEO3biaFmN;yZD(0|imY(f-RI%db276PqO~|`a1%8yL z2`6LT^&F?GW(A%o@L8X0+S?vb2hzcv2klk?gHa4P&#-RlV7ksxOYxL$Y;?;(i_`LD zh$~0#6LmWvPpiSBx95fH;mTr2TuQ}%qx&lw?fWpi!=iQp_oOKX*` zOeJAGc?SnoW5@7g^~_xjTr5~hRRs5*EQT(xZ3#Ue03EhI$g^A+e|Q5sC(()LpAgd< zS3xy%Hqx~ci`=J;9?=6E(XHHG{%c{Kpk*+@*p5s^U+0ZA{u_@GHYTtla>__5!}Ryw zhMANAT{flQn5b(DWiK0-;N3ekNC3(@zf*j26ge-VN=tV%r=Y!axBaJ7cNVX?EDMxK z0@I(qwx{%QJ{4t2BwuBEQGQN&N=Er;jn^2;XKcxz{SiU9>unU`@GOn5(Jr2nzIo_3 z{RH-18!*hrSKH_LTDPodWaQaOG*5a(`Ot$yybOS1!5vH8MBQ-v)Q=LVf!lcnuXHfRW z2F8O8Vp%~8gii@>^tGxBq98?1OLks zV9(4iYQIH0B*)zfv(z(IrYl_D@>5VN(&XfVzTOeBO`r6_~q&B72-v9l6g{zFlG*w z@Urpe1HpgsB)NE5*Ze&5jG=P>)=bp4(fHeQqhZW9Nroc%#r#7~JT{i*IN^2P-rkSt zPQM6>%~KUrCKnvV;SF7dXr(Ul=ks%pi1N***s!jzLM%Ivmu|##h{E4}Wu+pr6I_pqDnkZ16a;6;n<2=Yd2$yQK8s3hl*_*8AF`dE9i;aS1f zNwNkgu|{Vtm73XwMa^@P%-jYuy!UrpqV2#eS)^*(sDV7V$2g4ZNQ9K4V}Xca)Wl_Z zUriSBzY9M_KBYi%CsMH3Mvmigc(mKS_MX&;siEND7O7n|>}Csbr{Z0Hix)J3{Lgxs zjXZ@6E*`6M;Ql?Ua?Nsz^|2^}SU$0@$Tx6h1YzID{PR~Mx&T*0+L*49f}L1!sRg;s z&T;(>TY%;4(?H6N(SwY*B~xJRLrUdoL)3Q6V>A7~p_GwR4dQ9-{-Tpr4b=65BKe34 zeFtKXEGvP<3SLY8E^sAjq>L~cU8(Op5A~@uor2JwG!~eRu15&e4qNuXXC@@9Wq)g9 zX^d$YlR1&4GVNM8K&|Vj7s;;*#*JGHlpjxzR{b~8sH7FK$NzLdq8qjZlcWFq0}zuq zk^>{L&6VJn%aYxx^j07?Ra0=jV0w6YTj5EoQlrEMh9;@5E7^ybQ9-oMk_=<{FPNIq zXGx*4mvyyBI{sprTkDf2zfD!oB(t&zw4>)URM#h=MP{DG6|7R6(pkUU*0Jnj`6o~` zOuO~`#h@{Ae!@^nKyjzV-8lkSy5Ow!({8t7=-V=tpb-eeUncS+ifI$I z#@1h6>#-Y9o#F~-e?<-QH3h%-PUO{*{10(zC6I+JRSKXd?B`O|!sO%Z=oW{o_=o2J zV1!m!egS!9#9*gj)X^U0j;k>~4j*j*^7Bf37wrLIv}oq6$zj?`m;~wGN$AT~HBb&8 zRW*m~%^8GSh?+ru5bTxDdfJ!cGrPLD-m*& zRb4%wW%rM7*ysXKm&uA;6Vqz)&%gLkgW-KvcMRrE>}-ZQk{lz(5EE6K$nSII^pt41 zbeLL1=~VJDK3`ucj9yPiNGEKxy0bNGWcJC|Fqr>Dq^|;iT5+M;%tszuh%qGQBBh0# zp!pD?q9VLDs8qGq!X{8MZm2iU|AABC>lV=Ez%ubm8Lz>^l&$&Ph8 z(Er2IQvcD1qc|u&g!B)@jY-(!xb=nXX(+C0t{K$C!;Ly99(>6XE!=@NF*t9pMgAi1 zYMM2_BVp*crk@eAyFueR?C9VLQZcxU@=uB)@fN_gH&!Ed8G)~J6Bj!(R%{&YD;K=j z3VK(ExjeOXfM2d%XdhNthe%BmG*Mio+xN`2GY7voZy#1uhq%n)NUWaETTw;a)q?>q zeTy8q4iV!U?H^P2P$%)~-xz$%14qsSr$GxmlDGy7rCz7!pk5`Xf_KKkxk$1ePc?&< zbkieQ^@di4I0@nWaVq*3wPJqo)@{qFX49HF($G`*1CDEy`b~_f>RHR74-W(D zVjS@F1VbOKwOV@ak)6g3-}w*~uUQ%C#3)bhy25OT|7dqQe5a;HhU(TUz&{J1-V0Sy z0ZP7F@V^D!7qhB3_&rw^%sgl#J7}MOiF&#>W-OC8ns!E5p89@V%|D#9;Ql6y+99r& z*@x1fl_bmXOV4zKe1AH@rwY&Q4S)Tn^5PSvhVn(D(-9`S!6 z4+@8+IQ(oXGf<$@*E&ckS&YFPio0RdYzJFm;L)JC&}XRLi32SaUxbQw&_r56E(W+= zEd2k{Noo-X05JnFbvi?H9FxYeOvEwCA=x}}9PY$HthF<`*&KnLCOju^$z!^);@Z*c z5jM4$Vd~N3(;#tj2K!UxFS)X-U^vo6{*LSA#hjs5r172ZU%XO|k*v4zl+bVy#Q%6^ zjG>5%hLpx6qqa z#~RjYLY^T6B&<*ST!YC7?Os{aY?&g-vR^S)EOgASDcl%4kjcrkD`a?pDGD$yKF`Wr z{J%Ezx62TtA%z;3it!5~r{QM`Z5VpEY=SS1Z0|V&*66B?h7q1rfA7m^VVIuy!Ful1Ar7)^TFUoJTAuUZyZGWScZmR@!`sGiw-) z$5mhNh1O6sJy{%eu%>3|jiALbVL>Z(&}BsoV*IBtM=N(1G`Ub8w29N_*}JiBV_jE~ zG1AR5>V`}F9R$hieKi(lbSqrrilWd@@>Oa8q}DmKIRw{~ZHfvRuyKi3s5q}8L4%Ua zk00uUDCB8u>>U466Qft2;6_T}O@MI4r`WE@i2!?#s| zhL24RNhXiq$;+s9AKe|DyD#&`9av{HRFj*Q2Kd5+Ny&f8l9+#;m_BPCiV&)gqd#q##-j3ElM1(UFc*U&Q_$(Ka0$c3=)r;<+(u&hXI+>#$tfI~%GtVliUc$u>W) zlH}YYkZQw-J_e|b8g8nArgjV3ddhrP%4Wxc`;w5~C)s+N<;R-V?r=#*cZ_Ie+hXvb zYV4dEmnBur(p$tJR7rK`yada4$BNc{G}&AX3~n3Cl_dQ{jb?4C(qX@gDaBW;anF49 zpatzCg;wVtfQv%?K!gkt)S16);7J!leOI)OrQ=cl3leCGo+#f8M1*Rq1)kJ0wyb8* z|NV5!R+J8Y8T|zy{S|ezYv#t;spDHIuK8w#``53)Dc{PN=zEFJloNAtnix$xbu9$l z$kzTUZ(S7L2QgA-<`lgDrfE(R20uhl^YBCn=OPCuo1fXSyRkUSwk8Pm57O66f z7Hz)1l-;GW_%C%VqAi<`(O*?eH4JxdZOq=**XQXCH=@}}QlrrySf7aIAr~Mr3jCvh zXprV{(oP~?teiASJYs9Ab1vcH;&v+iw3?1mW=Y}*TCZVe?f{)?A1NwVh9TVLwIXfA zUl=dtXZ`CS`1L28#XI>ueYk6OeNy-($6Y|@xifW%7a2lmiIFDorb5>|t(I%9G~@Z5 ze{^Oopp?z4{XqO0%_Arx#7Gj+J=-JGFALtMAAYA4pP~5SehBwo>k{HD8*8Zy!6p*l?BN z>glCR{^GcRm0N4%iY?yp#3Y8l8_AL`Ci|w}q%eyBMV!x>(T6a!>6MEnV~s#?^wQDF^G<#;!_?Ck>FqNg+=rg&|Naxm>9896a!hH>0Y@AnPt8NE>AXGPqk@FjfN# z9~9^uDut`*A3XGUhV<#M!37aitC83OvGte0a?%760ZcgD(6fHjf)w%2`S&Sra@nqq z5+imb0f^_14}`Ur(643RvVT^{l85oo;fW|=iqj)uT}Aq)qsWjC-k1m19#paeq{TS7CO@Gt-5yU(Hsap#i!i*!)B z6t|ocZ5ZG{EbmKA1iy>uh*XLGpFIF_$yz&6Mxn?+xo6TEhn*}`dM|O@5l<882Ll1O zDqXF8bQbUo+uB1@lsF^F&qcu)g%%t*J_GOonPbJ${i2WVU?a%@;BM2C)zE8&XdqnC z{@OwF%lO_$!)P~mtx*6dL67olqhrEfg}3h{>Vu*}zjE;f?}4R&J;eLTu7{d^xzH9PFO1E}OOgR)34!DgFQ6aZ~$$cP3-aYRh!~PXS~l2K^Rm2vn+I@f>0 zwEpH*9v6rhQnK1Z$!wKa3Jol=u6Jy()`HhllYZJB0I&2dd!QkTQXGF3l70)yWF3M% z83)rmHx6sUfRdtId0BEi4Fm2B${1ZxXDnh#a%$%uI1t#kIC;CJX>EK6q9q!vzHl(o z$6S=pS}JriVt>>_Xs+HQfa=CfIMr;zXGo))Qn3LiTWho17i4uM2989V=JL(uiNC~> zoEym@hc?js=MLVByNm0`i5nM0(!Ek%QjAM(rfA}x5Te1vh`#INy_dfy z34(7V^6n)b)aq0}%A(5L*o%_k@yPB|9*J>FLcE?bV@FpLF=Y4ZO--|c??>jB2d(5^ z8uz8*Nw@m}`?Gf)mHS`YUTcqg9iFd5sJDJ|{bf)JNG%!eh(^fy&+#E0WG3(?6ib!U`y6_rQ05rYAG&d)N1WRPzD`SFI@yscxy7UAALRT^B(a`ZX+SS4-tfj8hR$rze5b-)&}uAVPQy8bwZ0 z(IZW)6g-DwqgJigGWCPN$66RN-uxU=W;&Ag$T>Ppbx8K((YB46AN=R&F(~)`Xwb4R zpYYC|h9r>_in)lO%xZTerIP6w;FHj!Ch)ku-vQqGH}98jQPBbnjnyyMS)3d~p8rWX zHt$8dUz?mWwob51yHLd8VZ-_e;?RHY^h?ecM$+9lV~l-9fXB#H7)AywhZ1c^^&+Dv z_))flgLDF%N5KkAJypfIMQ>do6c$61mGnJ+2;rNSjrk16KcnA90}ihmMU3^*1)^B; zQMilsra++?BVnuu8a&M$R)5{TnXk7zLl|0%pwKSiHqqa!sgKxi^z^>CWUM>4=Lcu( zDd06dxyeeQa3K{4I^@cmOLZcKw=v3M-NcLSGce-q>_6;aNG9Ox=!Sj)ek6bun|CR)|h)Kb9iABKc=h-iHV@E71 ztdkQPrIBU3gyiu*27L4XeXTddXb~vhWeXt z<3R=+U~eAYCw&MlWM|^Q;8BeO42<1zU)gFP5;c=>8n4+q&ZjC;dD*LDay3SuJ-u7?bduBuTsFr{;q(eM4{4J0JmTQ zS&ivy%N#caB67dhIG16DdMrP-ba~QF1&NUWu|2Yy0c1fav=Tda-M^ezG*vn)oKD;6 zdhw@BjSwj&)c@&PjrUphn6t2XEKZu7Mttmf{joAcrzby*C888^M?v;AalDv$WC*ff z;cdC~^M8=XAPy;cT@W2D5f+)Z!r~_E$AD!YC6+|Yh2f=O7MP;>D#R~TT9*Cnm&LcJ z1|04saN*e?z-2c!DBXtuud+s3AkBh#x*=x>(%hZ9WLH3sW_VW$s6meuAhjU4znrsE z9J`oyw({5?jG&12$t0!TR)fbj(^4SvqI974sqgHWA)a4uoSn7zQ(~Fc5!#mKL>~Zor zfqs#xGBik(jYcB>exLAwI#;ea={+ih09tb@uwrp4=?vMmsHiM{)i#er!U6Z>$^wG+CPey-s4y zP%rAaE=%&A^uG%Y*iPDmKV`I9=SFr{hl5so6E!GtS5Pb@yvy}|6eTccxQZAR49K75 z_xx6mnOBeF>wZdj4mcG?^<2<9bLrwSdtaV?aTcyMz$Y$%nOGX1=ew7`WieSQ&58OT zI=?6=)!b4x9bwo~MyfZ|qq+Afa=9meqOPoXA?=r_Gbl2TxAWNLZGRvWMC)%bTU#!i zN#M5g5;K5kJqFv?!QZr5S-{YlT+i=>7b4|NGS6RYxQz0{NqjLnFFMgCtdYA$V)~~H z=Z01+KRZ#rz1X7wjs2&~VMvoSXTdVM16&tykd=mJtq|CMt%rYt4{Gd-|L0JHoTjrj z;?i6S{rM0W5NjI$gW=m-lK*G|!gOyBe;m2UZ3d!1e2qT_6*^%2_+PcNG_r^%$`3>zt?=1c3M&OviF}bdM1;JR zqnzil%l(J42r`Wnw+$2g8KUA_jGX(CvgqPu65*h_VAL01hQD0Zk*I{{Evu@&fuhdM z*GM`Pm%ibvT*2fw8T+(S@#mPzB&3*>i@=>|W!ODxYHdLw9K_3vt%?;~)&prX+yKdUdsVFYHPd4%ee@5n}k?fVuYY{IKdr z!H(}<1SjmK`_<{@;?{Dq%RvTS!sKuVbWh1o=BMe)fg?H%LgF7yg-P-z9Kb6=GPNA# z#af&0H=o$>$I#-24?NnXmcBFOuMkQBNZu4$3zHO~PQg9?Lqu9TV5EVc7K~%ofs$#y zO*|havI&x>)r74sk30M_f>_NvOiW`dx%aeo2=$ChO%WT0+KIh;>YQ)QUk^qX`gLB@ zvnL1pcNT6?SoX3*c9(U*%Huirhad71(Q&lfc|$OTAT2sgGL>kWxH+OiCI|E_IZ)VX z)G%W^s`vnzOJu?UjN8SQO;Hwa6` zm7E{e?xuz_5vl?F;6Mh6d!)5~EOnx`NQ{5#J0iigX0MDj0%zPv`ydx>C{F*aYT{A$ zotd0j-|#-%L!D?CDdXK9nlQJ;*!^UFYfqty$_F{oPoHHMtMbt9Jg|h~)LB$Opgnx- zA-Brfe$Q9s&9t4^a!O0H==>NYc}~?T5{iT8CKwV{f@tyQEz+AyEIK!|lCj;wR%#*n zF&$Qdhvrx^(gIc-V*~)$JCfI+>(;zwy)fWnc8a;osyCavkdRW@7m`L>F=Au@DKY^T zzCrrTi>AZ8Fl^1W9F^d%&w;u5b8hv9=;$bh8kNc;AWr`X`%r?klqR$Tk`ec z5G4uCEp4Qu+f37`gpe!wN)mz=|NBSPNYaJz$1Rkd0@9H&N)juuDSQKF1IrBhu{$4z z{;}n!Esv^ajTBh(l%Ugp2`$GPcpK$lF`e6e{UbQoaLyV7YRn(aOcQ0aEl9wTmTNUS zKebrAPm+s8uAT*tva7W*=gUdVUG2f`#0pbi^AnwF%NH&*m5q~lmlqcK(8pvxu|4-p(rbaI4OkZY_auHj$8?gV0nBOv=~%3&RiI_v|j?pLg(&c@Oh$8Gh0fY7AaEn#aM} zhB2S>T?A}O{khU?GH$snSmApjm(nnnD6-OD+q;LX`NxlFJX{8p9Dkceq=zsxb_)CY z?HE36_oCQILx&DSf1g9HE3kdCc;%h~Foe0k0;lwg^)24G9$a_PBC{gO^aHTpo0U@v zG@F&kXd34DGG?54nyzz6Wd-vVHlq-wFxOf-rl(lpU|G>S3gQA=${tRpK{XY(~W!CEL*JxSSgj2*>CD8Bpj=(BnbHH z#cJ?|)<+rwh~Z7sg-n?zZ0yaH%5+N;jlu@;t;#uNZ&YMBgZJ%oPHsj>K!=8L)Y>i} zZm}%xXB@Lg;1u!&S(YvZW$G_axDue^bF~*ez*@{xS6$?*5G+`Oxg9PkTzuW$8aaC@&UMhLoLQe`I+bajztM?yVLdm96)ZQ&fm z!|O}-O2?47Mx=RwNb~#WB`+{YY2Yceu>Xt18A1e-H)toLJcTUdH5C9+AZpvWxa`fC z75x!It{~y?H+}_9Jo$IFzT)dOG9M(C)+FC^O4n2)ek!iGa@cxKcNSl4G$P?10Q{5> z=e_qAEr2D5dAg)&k-H`gImVw56wCR3JG3jnsD?o2A%yg&mLuHg`m9@vvgB2hB+j{* z{~5+6Grlb;!KL!y_B4aa-)JHyx@fp8KiS13-CZYUU6&@x#%0&cdfp_8 za@_3#1RgJiaWt}(9)KHUCv8&?1L~oadPafTcMp`Fo0I6v?JH^xtjJw{9_FmZaXCur6BwfuzW{6f9mwX4M zys`r?vM@na^2gca1g%ugYD5f9QRlJr%la=Ia%>}_y(Xs|24Mn{mEvIuPbn#z=5JY_ z#RiBxJ#M2eg>Ji^XmHLm7=cd5n_3}~$j!f$#vmAQ?cC+m7vlKkFB|pV^X)G17sIyV z+|f`u<0Ky1X~+j$gYQz1NS3M#bDVz{y_a5+l8sK`K`{%dLqKzai>Wzl(D#;&O4~&qT#H zEHA1?9Z$kCR3SgB^gbV0v`9Z$Qw06ik(_4x#${6#YWkC&+d9GN=`dWX22DAPpFPx+ z1Z-yC1qGf8pq`^Cw|~y`rEu-kEUqvJWQgkfA2vi6$p!^VPP}8cUkD#Ax<)E=Dn*Et zPR4LFGHqW4H|x_>&dRa-6RS@~2!-%J$PlmFh1DV2gW0X>%GL`ooW2d{0jkuqKpqBWNlw7%D^w#1S8G|La!G)+tSk0623bNM97lrrRZj$9U(~* zR5P5_6xm!%IY_T#z$PCRBd*8^$)C0Vwz?)xlh;<8$rn#4w)u~*J3r2@UQH;YjRN^? zm?We}@ToZN6a|43ywf6Pia&j1d5>%BVzUAJ+%DR?GuDK4E^R)=eBev*k9(87c;6VF&5JN>zEIH|tlh0CtCE>cbrX7UqAt9Y`ZR|!vV6doKOglp{Q1|v9N)7BUp_o|5Y`7DpXhc?npOHWs`wK!@VCmW53uD zlPKqjP+E!l^=olh975)g;>x#vvHS@sKZfqN8{d7Wut%00f-HbG0?F#9h3ik$)gRXK zdy11@p1ur3fXGdW=Mh)rtg~1YM3T4wnk=XpIF;)FPH1P#Y8IF(p|y z+9FUXk^=t=>n^NS@{a_fi2BDAzs<s!>3Ql<>6bixMJ{k{-?t()T!H?$RMtnv^3| zOjE3%W=|bGZfcjm6C=!A$X#Tw><|9tIE1H61(z0zv;Bp4LzX+835&{^4uy@URrA4lGJ%gZHLpm5vD1k zJmO5?5Kb4 z&(+-fC^2M^q-A+rwJJdC6!v^@7nCCE$HZa^IHYHMcSkB%?kgqFc>Xl>!!;3A&Q2MG zD3n3V>;%t{Dp-D~rWMTpjl3fR;OU+=OrnYq5^zixBACV4e7%{EGvDRw2`&g(N9^7f zS>)As3*uwXWFHP>nJ{D(8SF>G!$6#G?8-)JE@lbir(^P71wS+yoB`@e(MK|RaQdzV zBbf`er2Anm2iSh&O^i+tCeE)vdIiYa!kYU<*E0Xpi#1|LvBSC)z}Ld0v^e1vszLxi zgoOTB*&S*W;~N3QieFydui(-i5{AiYr&kzjy|9#F1TaV|?=Os;Ee0bu z6Ci+!(eo4Z(Z1S%4~}*=yWYl(V8*)M_{4%Rgu*GAUU>`Kes&reytGRKb5Yz>Z$Ntw zmBK7QoC~-iNWFBlBgBLeZ)CT$nlG94Zy+m8P8Tslc5GHK^*yJ>Xy@=3_e8R<}Wi_TSd}0g5UeMvj2L2*$ATBN`w?1 zD^NqpnUFaZG1uv*OQqZu7eK6b8iunZPyy^L2JD>tz-_eWMcVXgf3nDQ_;451Cx+Vl zEv`Zsy6xd2T?k%uXK#1yv04!<+~we%bw~`U`JCzg@78N%N$!DgV8EU4m9sSj2F{A~ z6^skkCz>~Y{GQTj8^cclw=!+EZ!{eiCwY+-yGGJz4(W#=A>@@ts^P!Gch^-L!Fk90 z4P0W2h3%+D0Cnku5zajunqxvqBN%X-Sh>GuEx?^u@Y{X=6(u;X&9OO{UlgFy}eHM#QYOId(Q@5|n+T|pR$p<{9 diff --git a/assets/harbor/harbor-1.13.1.tgz b/assets/harbor/harbor-1.13.1.tgz deleted file mode 100644 index 37a1caf175d283634b99911464284f56e787c22c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47901 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

AZ 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 JNZ#m3{|BgbuVw%M diff --git a/assets/harbor/harbor-1.14.1.tgz b/assets/harbor/harbor-1.14.1.tgz deleted file mode 100644 index 1309c271596aaad2bb9d4cef6505529e4b484653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49159 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 Q`1kK1p8p-d2LDc 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 TpXhf000960q;>gj0H_84IBj9$ diff --git a/assets/harbor/harbor-1.15.1.tgz b/assets/harbor/harbor-1.15.1.tgz deleted file mode 100644 index e90a9bf3b98c633d119caf9407ba95f59c0fd016..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49974 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 Jv)llv1^}mC5hwrv diff --git a/charts/harbor/harbor/1.12.3/.helmignore b/charts/harbor/harbor/1.12.3/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.12.3/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/Chart.yaml b/charts/harbor/harbor/1.12.3/Chart.yaml deleted file mode 100644 index 6e427f2c9e..0000000000 --- a/charts/harbor/harbor/1.12.3/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.8.3 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/master/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.12.3 diff --git a/charts/harbor/harbor/1.12.3/LICENSE b/charts/harbor/harbor/1.12.3/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.12.3/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.12.3/README.md b/charts/harbor/harbor/1.12.3/README.md deleted file mode 100644 index ff353d564d..0000000000 --- a/charts/harbor/harbor/1.12.3/README.md +++ /dev/null @@ -1,420 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be find [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker/notary client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.tls.secret.notarySecretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key. Only needed when the `expose.type` is `ingress` | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.hosts.notary` | The host of Harbor Notary service in ingress rule | `notary.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.ingress.notary.annotations` | The annotations specific to notary ingress | {} | -| `expose.ingress.notary.labels` | The labels specific to notary ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.clusterIP.ports.notaryPort` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | `4443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.nodePort.ports.notary.port` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | `4443` | -| `expose.nodePort.ports.notary.nodePort` | The node port Notary listens on. Only needed when `notary.enabled` is set to `true` | `30004` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.ports.notaryPort` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| **Notary** | | | -| `notary.enabled` | Enable Notary? | `true` | -| `notary.server.image.repository` | Repository for notary server image | `goharbor/notary-server-photon` | -| `notary.server.image.tag` | Tag for notary server image | `dev` | -| `notary.server.replicas` | The replica count | `1` | -| `notary.server.resources` | The [resources] to allocate for container | undefined | -| `notary.server.priorityClassName` | The priority class to run the pod as | | -| `notary.server.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `notary.signer.image.repository` | Repository for notary signer image | `goharbor/notary-signer-photon` | -| `notary.signer.image.tag` | Tag for notary signer image | `dev` | -| `notary.signer.replicas` | The replica count | `1` | -| `notary.signer.resources` | The [resources] to allocate for container | undefined | -| `notary.signer.priorityClassName` | The priority class to run the pod as | | -| `notary.signer.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `notary.nodeSelector` | Node labels for pod assignment | `{}` | -| `notary.tolerations` | Tolerations for pod assignment | `[]` | -| `notary.affinity` | Node/Pod affinities | `{}` | -| `notary.podAnnotations` | Annotations to add to the notary pod | `{}` | -| `notary.serviceAnnotations` | Annotations to add to the notary service | `{}` | -| `notary.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate authority, certificate and private key for notary communications. The secret must contain keys named `ca.crt`, `tls.crt` and `tls.key` that contain the CA, certificate and private key. They will be generated if not set. | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.notaryServerDatabase` | The database used by Notary server | `notary_server` | -| `database.external.notarySignerDatabase` | The database used by Notary signer | `notary_signer` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.12.3/conf/notary-server.json b/charts/harbor/harbor/1.12.3/conf/notary-server.json deleted file mode 100644 index b3c2624134..0000000000 --- a/charts/harbor/harbor/1.12.3/conf/notary-server.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "server": { - "http_addr": ":4443" - }, - "trust_service": { - "type": "remote", - "hostname": "{{ template "harbor.notary-signer" . }}", - "port": "7899", - "tls_ca_file": "/etc/ssl/notary/ca.crt", - "key_algorithm": "ecdsa" - }, - "logging": { - "level": "{{ .Values.logLevel }}" - }, - "storage": { - "backend": "postgres", - "db_url": "{{ template "harbor.database.notaryServer" . }}" - }, - "auth": { - "type": "token", - "options": { - "realm": "{{ .Values.externalURL }}/service/token", - "service": "harbor-notary", - "issuer": "harbor-token-issuer", - "rootcertbundle": "/root.crt" - } - } -} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/conf/notary-signer.json b/charts/harbor/harbor/1.12.3/conf/notary-signer.json deleted file mode 100644 index 75a4d68bdb..0000000000 --- a/charts/harbor/harbor/1.12.3/conf/notary-signer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "server": { - "grpc_addr": ":7899", - "tls_cert_file": "/etc/ssl/notary/tls.crt", - "tls_key_file": "/etc/ssl/notary/tls.key" - }, - "logging": { - "level": "{{ .Values.logLevel }}" - }, - "storage": { - "backend": "postgres", - "db_url": "{{ template "harbor.database.notarySigner" . }}", - "default_alias": "defaultalias" - } -} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/NOTES.txt b/charts/harbor/harbor/1.12.3/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.12.3/templates/_helpers.tpl b/charts/harbor/harbor/1.12.3/templates/_helpers.tpl deleted file mode 100644 index eb467e773e..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/_helpers.tpl +++ /dev/null @@ -1,570 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- .Values.database.internal.password -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notaryServerDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "notaryserver" -}} - {{- else -}} - {{- .Values.database.external.notaryServerDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notarySignerDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "notarysigner" -}} - {{- else -}} - {{- .Values.database.external.notarySignerDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notaryServer" -}} -postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.database.escapedRawPassword" . }}@{{ template "harbor.database.host" . }}:{{ template "harbor.database.port" . }}/{{ template "harbor.database.notaryServerDatabase" . }}?sslmode={{ template "harbor.database.sslmode" . }} -{{- end -}} - -{{- define "harbor.database.notarySigner" -}} -postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.database.escapedRawPassword" . }}@{{ template "harbor.database.host" . }}:{{ template "harbor.database.port" . }}/{{ template "harbor.database.notarySignerDatabase" . }}?sslmode={{ template "harbor.database.sslmode" . }} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- $cred := ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) $cred (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary "1" .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary "2" .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary "5" .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary "2" .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.notary-server" -}} - {{- printf "%s-notary-server" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.notary-signer" -}} - {{- printf "%s-notary-signer" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress-notary" -}} - {{- printf "%s-ingress-notary" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.notary-server" .) (include "harbor.notary-signer" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components except notary because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsNotarySecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.notarySecretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: "{{ .Values.trace.attributes | toJson }}" - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-cm.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-cm.yaml deleted file mode 100644 index adecb1ceb4..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-cm.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - WITH_NOTARY: "{{ .Values.notary.enabled }}" - NOTARY_URL: "http://{{ template "harbor.notary-server" . }}:4443" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration | quote }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-dpl.yaml deleted file mode 100644 index 2ca8b0c5e5..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-dpl.yaml +++ /dev/null @@ -1,221 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: "{{ template "harbor.jobservice" . }}" - key: JOBSERVICE_SECRET - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-secret.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-secret.yaml deleted file mode 100644 index 20f835b1d8..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - secret: {{ .Values.core.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (randAlphaNum 32) | b64enc | quote }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-svc.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.12.3/templates/core/core-tls.yaml b/charts/harbor/harbor/1.12.3/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/database/database-secret.yaml b/charts/harbor/harbor/1.12.3/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.12.3/templates/database/database-ss.yaml b/charts/harbor/harbor/1.12.3/templates/database/database-ss.yaml deleted file mode 100644 index 733243c71c..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/database/database-ss.yaml +++ /dev/null @@ -1,162 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.12.3/templates/database/database-svc.yaml b/charts/harbor/harbor/1.12.3/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.12.3/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.12.3/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 5ff36f48a6..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,117 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter - annotations: -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.12.3/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.12.3/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.12.3/templates/ingress/ingress.yaml deleted file mode 100644 index eedd13604a..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/ingress/ingress.yaml +++ /dev/null @@ -1,209 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} - {{- $_ := set . "notary_path" "/" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} - {{- $_ := set . "notary_path" "/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} - {{- $_ := set . "notary_path" "/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- if .Values.notary.enabled }} ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress-notary" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.notary.labels }} -{{ toYaml $ingress.notary.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.notary.annotations }} -{{ toYaml $ingress.notary.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsNotarySecretForIngress" . }} - {{- if $ingress.hosts.notary }} - hosts: - - {{ $ingress.hosts.notary }} - {{- end }} - {{- end }} - rules: - - http: - paths: - - path: {{ .notary_path }} -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - backend: - serviceName: {{ template "harbor.notary-server" . }} - servicePort: 4443 -{{- else }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.notary-server" . }} - port: - number: 4443 -{{- end -}} - {{- if $ingress.hosts.notary }} - host: {{ $ingress.hosts.notary }} - {{- end }} -{{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/ingress/secret.yaml b/charts/harbor/harbor/1.12.3/templates/ingress/secret.yaml deleted file mode 100644 index 0d89af99ac..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core .Values.expose.ingress.hosts.notary) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.12.3/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 50de1dc868..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 32df454b10..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,150 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index 3dfa6bd5e6..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.12.3/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index ad8522974d..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.12.3/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.12.3/templates/nginx/configmap-https.yaml deleted file mode 100644 index 74c667e009..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,230 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - {{- if .Values.notary.enabled }} - upstream notary-server { - server {{ template "harbor.notary-server" . }}:4443; - } - {{- end }} - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - {{- if .Values.notary.enabled }} - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 4443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:4443 ssl; - {{- end }} - server_tokens off; - # ssl - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # recommendations from https://raymii.org/s/tutorials/strong_ssl_security_on_nginx.html - ssl_protocols tlsv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:ssl:10m; - - # disable any limits to avoid http 413 for large image uploads - client_max_body_size 0; - - # required to avoid http 411: see issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - location /v2/ { - proxy_pass http://notary-server/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - - proxy_send_timeout 900; - proxy_read_timeout 900; - } - } - {{- end }} - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.12.3/templates/nginx/deployment.yaml deleted file mode 100644 index bc1de0abfe..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/nginx/deployment.yaml +++ /dev/null @@ -1,109 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/nginx/secret.yaml b/charts/harbor/harbor/1.12.3/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/nginx/service.yaml b/charts/harbor/harbor/1.12.3/templates/nginx/service.yaml deleted file mode 100644 index df4da0944a..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/nginx/service.yaml +++ /dev/null @@ -1,96 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $clusterIP.ports.notaryPort }} - targetPort: 4443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $nodePort.ports.notary.port }} - targetPort: 4443 - {{- if $nodePort.ports.notary.nodePort }} - nodePort: {{ $nodePort.ports.notary.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $loadBalancer.ports.notaryPort }} - targetPort: 4443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/notary/notary-secret.yaml b/charts/harbor/harbor/1.12.3/templates/notary/notary-secret.yaml deleted file mode 100644 index 6de63dd8c5..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/notary/notary-secret.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and .Values.notary.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary -type: Opaque -data: - {{- if not .Values.notary.secretName }} - {{- $ca := genCA "harbor-notary-ca" 365 }} - {{- $cert := genSignedCert (include "harbor.notary-signer" .) nil (list (include "harbor.notary-signer" .)) 365 $ca }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - {{- end }} - server.json: {{ tpl (.Files.Get "conf/notary-server.json") . | b64enc }} - signer.json: {{ tpl (.Files.Get "conf/notary-signer.json") . | b64enc }} - NOTARY_SERVER_DB_URL: {{ include "harbor.database.notaryServer" . | b64enc }} - NOTARY_SIGNER_DB_URL: {{ include "harbor.database.notarySigner" . | b64enc }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/notary/notary-server.yaml b/charts/harbor/harbor/1.12.3/templates/notary/notary-server.yaml deleted file mode 100644 index 64cfd293f2..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/notary/notary-server.yaml +++ /dev/null @@ -1,111 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary-server -spec: - replicas: {{ .Values.notary.server.replicas }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: notary-server - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: notary-server - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/notary/notary-secret.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if .Values.notary.server.podAnnotations }} -{{ toYaml .Values.notary.server.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.notary.server.serviceAccountName }} - serviceAccountName: {{ .Values.notary.server.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.notary.server.automountServiceAccountToken | default false }} - containers: - - name: notary-server - image: {{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /_notary_server/health - scheme: "HTTP" - port: 4443 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /_notary_server/health - scheme: "HTTP" - port: 4443 - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.notary.server.resources }} - resources: -{{ toYaml .Values.notary.server.resources | indent 10 }} -{{- end }} - env: - - name: MIGRATIONS_PATH - value: migrations/server/postgresql - - name: DB_URL - valueFrom: - secretKeyRef: - name: {{ template "harbor.notary-server" . }} - key: NOTARY_SERVER_DB_URL - volumeMounts: - - name: config - mountPath: /etc/notary/server-config.postgres.json - subPath: server.json - - name: token-service-certificate - mountPath: /root.crt - subPath: tls.crt - - name: signer-certificate - mountPath: /etc/ssl/notary/ca.crt - subPath: ca.crt - volumes: - - name: config - secret: - secretName: "{{ template "harbor.notary-server" . }}" - - name: token-service-certificate - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - - name: signer-certificate - secret: - {{- if .Values.notary.secretName }} - secretName: {{ .Values.notary.secretName }} - {{- else }} - secretName: {{ template "harbor.notary-server" . }} - {{- end }} - {{- with .Values.notary.server.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.server.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.server.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.notary.server.priorityClassName }} - priorityClassName: {{ .Values.notary.server.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/notary/notary-signer.yaml b/charts/harbor/harbor/1.12.3/templates/notary/notary-signer.yaml deleted file mode 100644 index d94e4909bf..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/notary/notary-signer.yaml +++ /dev/null @@ -1,105 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.notary-signer" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary-signer -spec: - replicas: {{ .Values.notary.signer.replicas }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: notary-signer - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: notary-signer - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/notary/notary-secret.yaml") . | sha256sum }} -{{- if .Values.notary.signer.podAnnotations }} -{{ toYaml .Values.notary.signer.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.notary.signer.serviceAccountName }} - serviceAccountName: {{ .Values.notary.signer.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.notary.signer.automountServiceAccountToken | default false }} - containers: - - name: notary-signer - image: {{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: "HTTPS" - port: 7899 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: "HTTPS" - port: 7899 - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.notary.signer.resources }} - resources: -{{ toYaml .Values.notary.signer.resources | indent 10 }} -{{- end }} - env: - - name: MIGRATIONS_PATH - value: migrations/signer/postgresql - - name: DB_URL - valueFrom: - secretKeyRef: - name: {{ template "harbor.notary-server" . }} - key: NOTARY_SIGNER_DB_URL - - name: NOTARY_SIGNER_DEFAULTALIAS - value: defaultalias - volumeMounts: - - name: config - mountPath: /etc/notary/signer-config.postgres.json - subPath: signer.json - - name: signer-certificate - mountPath: /etc/ssl/notary/tls.crt - subPath: tls.crt - - name: signer-certificate - mountPath: /etc/ssl/notary/tls.key - subPath: tls.key - volumes: - - name: config - secret: - secretName: "{{ template "harbor.notary-server" . }}" - - name: signer-certificate - secret: - {{- if .Values.notary.secretName }} - secretName: {{ .Values.notary.secretName }} - {{- else }} - secretName: {{ template "harbor.notary-server" . }} - {{- end }} - {{- with .Values.notary.signer.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.signer.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.signer.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.notary.signer.priorityClassName }} - priorityClassName: {{ .Values.notary.signer.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/notary/notary-svc.yaml b/charts/harbor/harbor/1.12.3/templates/notary/notary-svc.yaml deleted file mode 100644 index b6aa42d89e..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/notary/notary-svc.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.notary.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: 4443 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: notary-server - ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.notary-signer" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 7899 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: notary-signer -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/portal/configmap.yaml b/charts/harbor/harbor/1.12.3/templates/portal/configmap.yaml deleted file mode 100644 index 1cea8ab63f..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/portal/configmap.yaml +++ /dev/null @@ -1,63 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.12.3/templates/portal/deployment.yaml b/charts/harbor/harbor/1.12.3/templates/portal/deployment.yaml deleted file mode 100644 index d3469deef4..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/portal/deployment.yaml +++ /dev/null @@ -1,97 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/portal/service.yaml b/charts/harbor/harbor/1.12.3/templates/portal/service.yaml deleted file mode 100644 index ff4eda435b..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/portal/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.12.3/templates/portal/tls.yaml b/charts/harbor/harbor/1.12.3/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/redis/service.yaml b/charts/harbor/harbor/1.12.3/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.12.3/templates/redis/statefulset.yaml deleted file mode 100644 index 74b7581fd8..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/redis/statefulset.yaml +++ /dev/null @@ -1,109 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-dpl.yaml deleted file mode 100644 index 118a165d46..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,317 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.jobservice" . }} - key: JOBSERVICE_SECRET - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-secret.yaml deleted file mode 100644 index 529462906e..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if eq $type "swift" }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if eq $type "oss" }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.12.3/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.12.3/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.12.3/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.12.3/templates/trivy/trivy-sts.yaml deleted file mode 100644 index 37b19ac2d3..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,206 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.12.3/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.12.3/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.12.3/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.3/values.yaml b/charts/harbor/harbor/1.12.3/values.yaml deleted file mode 100644 index d8f4319ffc..0000000000 --- a/charts/harbor/harbor/1.12.3/values.yaml +++ /dev/null @@ -1,944 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - # Only needed when the "expose.type" is "ingress". - notarySecretName: "" - ingress: - hosts: - core: core.harbor.domain - notary: notary.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - notary: - # notary ingress-specific annotations - annotations: {} - # notary ingress-specific labels - labels: {} - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # The service port Notary listens on. Only needed when notary.enabled - # is set to true - notaryPort: 4443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - # Only needed when notary.enabled is set to true - notary: - # The service port Notary listens on - port: 4443 - # The node port Notary listens on - nodePort: 30004 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # The service port Notary listens on. Only needed when notary.enabled - # is set to true - notaryPort: 4443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker/notary client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each components tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/docker/distribution/blob/master/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be gcs-key.json - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.8.3 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.8.3 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.8.3 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## Additional service annotations - serviceAnnotations: {} - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.8.3 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.8.3 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.8.3 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/docker/distribution/blob/master/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.8.3 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -notary: - enabled: true - server: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/notary-server-photon - tag: v2.8.3 - replicas: 1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - ## Additional service annotations - serviceAnnotations: {} - signer: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/notary-signer-photon - tag: v2.8.3 - replicas: 1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate authority, certificate and private key for notary - # communications. - # The secret must contain keys named ca.crt, tls.crt and tls.key that - # contain the CA, certificate and private key. - # They will be generated if not set. - secretName: "" - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.8.3 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - notaryServerDatabase: "notary_server" - notarySignerDatabase: "notary_signer" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.8.3 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # username field can be an empty string and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - podAnnotations: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.8.3 - nodeSelector: {} - tolerations: [] - affinity: {} - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.12.4/.helmignore b/charts/harbor/harbor/1.12.4/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.12.4/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/Chart.yaml b/charts/harbor/harbor/1.12.4/Chart.yaml deleted file mode 100644 index 7a69cca9f4..0000000000 --- a/charts/harbor/harbor/1.12.4/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.8.4 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/master/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.12.4 diff --git a/charts/harbor/harbor/1.12.4/LICENSE b/charts/harbor/harbor/1.12.4/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.12.4/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.12.4/README.md b/charts/harbor/harbor/1.12.4/README.md deleted file mode 100644 index 85cc537c67..0000000000 --- a/charts/harbor/harbor/1.12.4/README.md +++ /dev/null @@ -1,427 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be find [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker/notary client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.tls.secret.notarySecretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key. Only needed when the `expose.type` is `ingress` | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.hosts.notary` | The host of Harbor Notary service in ingress rule | `notary.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.ingress.notary.annotations` | The annotations specific to notary ingress | {} | -| `expose.ingress.notary.labels` | The labels specific to notary ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.clusterIP.ports.notaryPort` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | `4443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.nodePort.ports.notary.port` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | `4443` | -| `expose.nodePort.ports.notary.nodePort` | The node port Notary listens on. Only needed when `notary.enabled` is set to `true` | `30004` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.ports.notaryPort` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| **Notary** | | | -| `notary.enabled` | Enable Notary? | `true` | -| `notary.server.image.repository` | Repository for notary server image | `goharbor/notary-server-photon` | -| `notary.server.image.tag` | Tag for notary server image | `dev` | -| `notary.server.replicas` | The replica count | `1` | -| `notary.server.resources` | The [resources] to allocate for container | undefined | -| `notary.server.priorityClassName` | The priority class to run the pod as | | -| `notary.server.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `notary.signer.image.repository` | Repository for notary signer image | `goharbor/notary-signer-photon` | -| `notary.signer.image.tag` | Tag for notary signer image | `dev` | -| `notary.signer.replicas` | The replica count | `1` | -| `notary.signer.resources` | The [resources] to allocate for container | undefined | -| `notary.signer.priorityClassName` | The priority class to run the pod as | | -| `notary.signer.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `notary.nodeSelector` | Node labels for pod assignment | `{}` | -| `notary.tolerations` | Tolerations for pod assignment | `[]` | -| `notary.affinity` | Node/Pod affinities | `{}` | -| `notary.podAnnotations` | Annotations to add to the notary pod | `{}` | -| `notary.serviceAnnotations` | Annotations to add to the notary service | `{}` | -| `notary.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate authority, certificate and private key for notary communications. The secret must contain keys named `ca.crt`, `tls.crt` and `tls.key` that contain the CA, certificate and private key. They will be generated if not set. | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.notaryServerDatabase` | The database used by Notary server | `notary_server` | -| `database.external.notarySignerDatabase` | The database used by Notary signer | `notary_signer` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.12.4/conf/notary-server.json b/charts/harbor/harbor/1.12.4/conf/notary-server.json deleted file mode 100644 index b3c2624134..0000000000 --- a/charts/harbor/harbor/1.12.4/conf/notary-server.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "server": { - "http_addr": ":4443" - }, - "trust_service": { - "type": "remote", - "hostname": "{{ template "harbor.notary-signer" . }}", - "port": "7899", - "tls_ca_file": "/etc/ssl/notary/ca.crt", - "key_algorithm": "ecdsa" - }, - "logging": { - "level": "{{ .Values.logLevel }}" - }, - "storage": { - "backend": "postgres", - "db_url": "{{ template "harbor.database.notaryServer" . }}" - }, - "auth": { - "type": "token", - "options": { - "realm": "{{ .Values.externalURL }}/service/token", - "service": "harbor-notary", - "issuer": "harbor-token-issuer", - "rootcertbundle": "/root.crt" - } - } -} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/conf/notary-signer.json b/charts/harbor/harbor/1.12.4/conf/notary-signer.json deleted file mode 100644 index 75a4d68bdb..0000000000 --- a/charts/harbor/harbor/1.12.4/conf/notary-signer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "server": { - "grpc_addr": ":7899", - "tls_cert_file": "/etc/ssl/notary/tls.crt", - "tls_key_file": "/etc/ssl/notary/tls.key" - }, - "logging": { - "level": "{{ .Values.logLevel }}" - }, - "storage": { - "backend": "postgres", - "db_url": "{{ template "harbor.database.notarySigner" . }}", - "default_alias": "defaultalias" - } -} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/NOTES.txt b/charts/harbor/harbor/1.12.4/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.12.4/templates/_helpers.tpl b/charts/harbor/harbor/1.12.4/templates/_helpers.tpl deleted file mode 100644 index 130ad5c04a..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/_helpers.tpl +++ /dev/null @@ -1,586 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- .Values.database.internal.password -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notaryServerDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "notaryserver" -}} - {{- else -}} - {{- .Values.database.external.notaryServerDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notarySignerDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "notarysigner" -}} - {{- else -}} - {{- .Values.database.external.notarySignerDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.notaryServer" -}} -postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.database.escapedRawPassword" . }}@{{ template "harbor.database.host" . }}:{{ template "harbor.database.port" . }}/{{ template "harbor.database.notaryServerDatabase" . }}?sslmode={{ template "harbor.database.sslmode" . }} -{{- end -}} - -{{- define "harbor.database.notarySigner" -}} -postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.database.escapedRawPassword" . }}@{{ template "harbor.database.host" . }}:{{ template "harbor.database.port" . }}/{{ template "harbor.database.notarySignerDatabase" . }}?sslmode={{ template "harbor.database.sslmode" . }} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- $cred := ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) $cred (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.notary-server" -}} - {{- printf "%s-notary-server" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.notary-signer" -}} - {{- printf "%s-notary-signer" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress-notary" -}} - {{- printf "%s-ingress-notary" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.notary-server" .) (include "harbor.notary-signer" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components except notary because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsNotarySecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.notarySecretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: "{{ .Values.trace.attributes | toJson }}" - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-cm.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-cm.yaml deleted file mode 100644 index 96562cc066..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-cm.yaml +++ /dev/null @@ -1,85 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - WITH_NOTARY: "{{ .Values.notary.enabled }}" - NOTARY_URL: "http://{{ template "harbor.notary-server" . }}:4443" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration | quote }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-dpl.yaml deleted file mode 100644 index 2ca8b0c5e5..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-dpl.yaml +++ /dev/null @@ -1,221 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: "{{ template "harbor.jobservice" . }}" - key: JOBSERVICE_SECRET - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-secret.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-secret.yaml deleted file mode 100644 index 20f835b1d8..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - secret: {{ .Values.core.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (randAlphaNum 32) | b64enc | quote }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-svc.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.12.4/templates/core/core-tls.yaml b/charts/harbor/harbor/1.12.4/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/database/database-secret.yaml b/charts/harbor/harbor/1.12.4/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.12.4/templates/database/database-ss.yaml b/charts/harbor/harbor/1.12.4/templates/database/database-ss.yaml deleted file mode 100644 index 733243c71c..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/database/database-ss.yaml +++ /dev/null @@ -1,162 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.12.4/templates/database/database-svc.yaml b/charts/harbor/harbor/1.12.4/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.12.4/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.12.4/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 5ff36f48a6..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,117 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter - annotations: -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.12.4/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.12.4/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.12.4/templates/ingress/ingress.yaml deleted file mode 100644 index eedd13604a..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/ingress/ingress.yaml +++ /dev/null @@ -1,209 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} - {{- $_ := set . "notary_path" "/" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} - {{- $_ := set . "notary_path" "/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} - {{- $_ := set . "notary_path" "/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- if .Values.notary.enabled }} ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress-notary" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.notary.labels }} -{{ toYaml $ingress.notary.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.notary.annotations }} -{{ toYaml $ingress.notary.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsNotarySecretForIngress" . }} - {{- if $ingress.hosts.notary }} - hosts: - - {{ $ingress.hosts.notary }} - {{- end }} - {{- end }} - rules: - - http: - paths: - - path: {{ .notary_path }} -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - backend: - serviceName: {{ template "harbor.notary-server" . }} - servicePort: 4443 -{{- else }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.notary-server" . }} - port: - number: 4443 -{{- end -}} - {{- if $ingress.hosts.notary }} - host: {{ $ingress.hosts.notary }} - {{- end }} -{{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/ingress/secret.yaml b/charts/harbor/harbor/1.12.4/templates/ingress/secret.yaml deleted file mode 100644 index 0d89af99ac..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core .Values.expose.ingress.hosts.notary) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.12.4/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 32df454b10..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,150 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index 3dfa6bd5e6..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.12.4/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index ad8522974d..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.12.4/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.12.4/templates/nginx/configmap-https.yaml deleted file mode 100644 index 74c667e009..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,230 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - {{- if .Values.notary.enabled }} - upstream notary-server { - server {{ template "harbor.notary-server" . }}:4443; - } - {{- end }} - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - {{- if .Values.notary.enabled }} - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 4443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:4443 ssl; - {{- end }} - server_tokens off; - # ssl - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # recommendations from https://raymii.org/s/tutorials/strong_ssl_security_on_nginx.html - ssl_protocols tlsv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:ssl:10m; - - # disable any limits to avoid http 413 for large image uploads - client_max_body_size 0; - - # required to avoid http 411: see issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - location /v2/ { - proxy_pass http://notary-server/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - - proxy_send_timeout 900; - proxy_read_timeout 900; - } - } - {{- end }} - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.12.4/templates/nginx/deployment.yaml deleted file mode 100644 index bc1de0abfe..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/nginx/deployment.yaml +++ /dev/null @@ -1,109 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/nginx/secret.yaml b/charts/harbor/harbor/1.12.4/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/nginx/service.yaml b/charts/harbor/harbor/1.12.4/templates/nginx/service.yaml deleted file mode 100644 index df4da0944a..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/nginx/service.yaml +++ /dev/null @@ -1,96 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $clusterIP.ports.notaryPort }} - targetPort: 4443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $nodePort.ports.notary.port }} - targetPort: 4443 - {{- if $nodePort.ports.notary.nodePort }} - nodePort: {{ $nodePort.ports.notary.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} - {{- if .Values.notary.enabled }} - - name: notary - port: {{ $loadBalancer.ports.notaryPort }} - targetPort: 4443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/notary/notary-secret.yaml b/charts/harbor/harbor/1.12.4/templates/notary/notary-secret.yaml deleted file mode 100644 index 6de63dd8c5..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/notary/notary-secret.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and .Values.notary.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary -type: Opaque -data: - {{- if not .Values.notary.secretName }} - {{- $ca := genCA "harbor-notary-ca" 365 }} - {{- $cert := genSignedCert (include "harbor.notary-signer" .) nil (list (include "harbor.notary-signer" .)) 365 $ca }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - {{- end }} - server.json: {{ tpl (.Files.Get "conf/notary-server.json") . | b64enc }} - signer.json: {{ tpl (.Files.Get "conf/notary-signer.json") . | b64enc }} - NOTARY_SERVER_DB_URL: {{ include "harbor.database.notaryServer" . | b64enc }} - NOTARY_SIGNER_DB_URL: {{ include "harbor.database.notarySigner" . | b64enc }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/notary/notary-server.yaml b/charts/harbor/harbor/1.12.4/templates/notary/notary-server.yaml deleted file mode 100644 index 64cfd293f2..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/notary/notary-server.yaml +++ /dev/null @@ -1,111 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary-server -spec: - replicas: {{ .Values.notary.server.replicas }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: notary-server - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: notary-server - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/notary/notary-secret.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if .Values.notary.server.podAnnotations }} -{{ toYaml .Values.notary.server.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.notary.server.serviceAccountName }} - serviceAccountName: {{ .Values.notary.server.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.notary.server.automountServiceAccountToken | default false }} - containers: - - name: notary-server - image: {{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /_notary_server/health - scheme: "HTTP" - port: 4443 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /_notary_server/health - scheme: "HTTP" - port: 4443 - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.notary.server.resources }} - resources: -{{ toYaml .Values.notary.server.resources | indent 10 }} -{{- end }} - env: - - name: MIGRATIONS_PATH - value: migrations/server/postgresql - - name: DB_URL - valueFrom: - secretKeyRef: - name: {{ template "harbor.notary-server" . }} - key: NOTARY_SERVER_DB_URL - volumeMounts: - - name: config - mountPath: /etc/notary/server-config.postgres.json - subPath: server.json - - name: token-service-certificate - mountPath: /root.crt - subPath: tls.crt - - name: signer-certificate - mountPath: /etc/ssl/notary/ca.crt - subPath: ca.crt - volumes: - - name: config - secret: - secretName: "{{ template "harbor.notary-server" . }}" - - name: token-service-certificate - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - - name: signer-certificate - secret: - {{- if .Values.notary.secretName }} - secretName: {{ .Values.notary.secretName }} - {{- else }} - secretName: {{ template "harbor.notary-server" . }} - {{- end }} - {{- with .Values.notary.server.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.server.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.server.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.notary.server.priorityClassName }} - priorityClassName: {{ .Values.notary.server.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/notary/notary-signer.yaml b/charts/harbor/harbor/1.12.4/templates/notary/notary-signer.yaml deleted file mode 100644 index d94e4909bf..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/notary/notary-signer.yaml +++ /dev/null @@ -1,105 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.notary-signer" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: notary-signer -spec: - replicas: {{ .Values.notary.signer.replicas }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: notary-signer - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: notary-signer - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/notary/notary-secret.yaml") . | sha256sum }} -{{- if .Values.notary.signer.podAnnotations }} -{{ toYaml .Values.notary.signer.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.notary.signer.serviceAccountName }} - serviceAccountName: {{ .Values.notary.signer.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.notary.signer.automountServiceAccountToken | default false }} - containers: - - name: notary-signer - image: {{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: "HTTPS" - port: 7899 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: "HTTPS" - port: 7899 - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.notary.signer.resources }} - resources: -{{ toYaml .Values.notary.signer.resources | indent 10 }} -{{- end }} - env: - - name: MIGRATIONS_PATH - value: migrations/signer/postgresql - - name: DB_URL - valueFrom: - secretKeyRef: - name: {{ template "harbor.notary-server" . }} - key: NOTARY_SIGNER_DB_URL - - name: NOTARY_SIGNER_DEFAULTALIAS - value: defaultalias - volumeMounts: - - name: config - mountPath: /etc/notary/signer-config.postgres.json - subPath: signer.json - - name: signer-certificate - mountPath: /etc/ssl/notary/tls.crt - subPath: tls.crt - - name: signer-certificate - mountPath: /etc/ssl/notary/tls.key - subPath: tls.key - volumes: - - name: config - secret: - secretName: "{{ template "harbor.notary-server" . }}" - - name: signer-certificate - secret: - {{- if .Values.notary.secretName }} - secretName: {{ .Values.notary.secretName }} - {{- else }} - secretName: {{ template "harbor.notary-server" . }} - {{- end }} - {{- with .Values.notary.signer.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.signer.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.notary.signer.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.notary.signer.priorityClassName }} - priorityClassName: {{ .Values.notary.signer.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/notary/notary-svc.yaml b/charts/harbor/harbor/1.12.4/templates/notary/notary-svc.yaml deleted file mode 100644 index b6aa42d89e..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/notary/notary-svc.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{ if .Values.notary.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.notary-server" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.notary.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: 4443 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: notary-server - ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.notary-signer" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 7899 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: notary-signer -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/portal/configmap.yaml b/charts/harbor/harbor/1.12.4/templates/portal/configmap.yaml deleted file mode 100644 index 1cea8ab63f..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/portal/configmap.yaml +++ /dev/null @@ -1,63 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2; - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.12.4/templates/portal/deployment.yaml b/charts/harbor/harbor/1.12.4/templates/portal/deployment.yaml deleted file mode 100644 index d3469deef4..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/portal/deployment.yaml +++ /dev/null @@ -1,97 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/portal/service.yaml b/charts/harbor/harbor/1.12.4/templates/portal/service.yaml deleted file mode 100644 index ff4eda435b..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/portal/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.12.4/templates/portal/tls.yaml b/charts/harbor/harbor/1.12.4/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/redis/service.yaml b/charts/harbor/harbor/1.12.4/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.12.4/templates/redis/statefulset.yaml deleted file mode 100644 index 74b7581fd8..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/redis/statefulset.yaml +++ /dev/null @@ -1,109 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-dpl.yaml deleted file mode 100644 index 118a165d46..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,317 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.jobservice" . }} - key: JOBSERVICE_SECRET - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-secret.yaml deleted file mode 100644 index 529462906e..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if eq $type "swift" }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if eq $type "oss" }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.12.4/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.12.4/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.12.4/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.12.4/templates/trivy/trivy-sts.yaml deleted file mode 100644 index 37b19ac2d3..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,206 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.12.4/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.12.4/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.12.4/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.12.4/values.yaml b/charts/harbor/harbor/1.12.4/values.yaml deleted file mode 100644 index 11d2c4a57d..0000000000 --- a/charts/harbor/harbor/1.12.4/values.yaml +++ /dev/null @@ -1,958 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - # Only needed when the "expose.type" is "ingress". - notarySecretName: "" - ingress: - hosts: - core: core.harbor.domain - notary: notary.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - notary: - # notary ingress-specific annotations - annotations: {} - # notary ingress-specific labels - labels: {} - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # The service port Notary listens on. Only needed when notary.enabled - # is set to true - notaryPort: 4443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - # Only needed when notary.enabled is set to true - notary: - # The service port Notary listens on - port: 4443 - # The node port Notary listens on - nodePort: 30004 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # The service port Notary listens on. Only needed when notary.enabled - # is set to true - notaryPort: 4443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker/notary client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each components tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/docker/distribution/blob/master/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be gcs-key.json - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.8.4 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.8.4 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.8.4 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## Additional service annotations - serviceAnnotations: {} - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.8.4 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.8.4 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.8.4 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/docker/distribution/blob/master/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.8.4 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -notary: - enabled: true - server: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/notary-server-photon - tag: v2.8.4 - replicas: 1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - ## Additional service annotations - serviceAnnotations: {} - signer: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/notary-signer-photon - tag: v2.8.4 - replicas: 1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## Additional deployment annotations - podAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate authority, certificate and private key for notary - # communications. - # The secret must contain keys named ca.crt, tls.crt and tls.key that - # contain the CA, certificate and private key. - # They will be generated if not set. - secretName: "" - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.8.4 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - notaryServerDatabase: "notary_server" - notarySignerDatabase: "notary_signer" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.8.4 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - podAnnotations: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.8.4 - nodeSelector: {} - tolerations: [] - affinity: {} - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.13.0/.helmignore b/charts/harbor/harbor/1.13.0/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.13.0/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/Chart.yaml b/charts/harbor/harbor/1.13.0/Chart.yaml deleted file mode 100644 index 6b093bb1a8..0000000000 --- a/charts/harbor/harbor/1.13.0/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.9.0 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.13.0 diff --git a/charts/harbor/harbor/1.13.0/LICENSE b/charts/harbor/harbor/1.13.0/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.13.0/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.13.0/README.md b/charts/harbor/harbor/1.13.0/README.md deleted file mode 100644 index f30598cc00..0000000000 --- a/charts/harbor/harbor/1.13.0/README.md +++ /dev/null @@ -1,407 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.13.0/templates/NOTES.txt b/charts/harbor/harbor/1.13.0/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.13.0/templates/_helpers.tpl b/charts/harbor/harbor/1.13.0/templates/_helpers.tpl deleted file mode 100644 index 95a28a6c5e..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/_helpers.tpl +++ /dev/null @@ -1,540 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- .Values.database.internal.password -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- $cred := ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) $cred (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-cm.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-cm.yaml deleted file mode 100644 index 7d284c899d..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-cm.yaml +++ /dev/null @@ -1,87 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration | quote }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-dpl.yaml deleted file mode 100644 index 8d202498db..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-dpl.yaml +++ /dev/null @@ -1,237 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: "{{ template "harbor.jobservice" . }}" - key: JOBSERVICE_SECRET - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-secret.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-secret.yaml deleted file mode 100644 index 23b352b475..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-secret.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - secret: {{ .Values.core.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (randAlphaNum 32) | b64enc | quote }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-svc.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.13.0/templates/core/core-tls.yaml b/charts/harbor/harbor/1.13.0/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/database/database-secret.yaml b/charts/harbor/harbor/1.13.0/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.13.0/templates/database/database-ss.yaml b/charts/harbor/harbor/1.13.0/templates/database/database-ss.yaml deleted file mode 100644 index 3b08b07ef1..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/database/database-ss.yaml +++ /dev/null @@ -1,168 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.13.0/templates/database/database-svc.yaml b/charts/harbor/harbor/1.13.0/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.13.0/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.13.0/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 6d2e1f53ac..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,139 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.13.0/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.13.0/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.13.0/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.13.0/templates/ingress/ingress.yaml deleted file mode 100644 index e4c06939c6..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/ingress/ingress.yaml +++ /dev/null @@ -1,145 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/ingress/secret.yaml b/charts/harbor/harbor/1.13.0/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.13.0/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 32df97db76..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,166 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index 3dfa6bd5e6..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.13.0/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.13.0/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.13.0/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.13.0/templates/nginx/deployment.yaml deleted file mode 100644 index 8290d497b6..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/nginx/deployment.yaml +++ /dev/null @@ -1,126 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/nginx/secret.yaml b/charts/harbor/harbor/1.13.0/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/nginx/service.yaml b/charts/harbor/harbor/1.13.0/templates/nginx/service.yaml deleted file mode 100644 index 12021bfd1a..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/nginx/service.yaml +++ /dev/null @@ -1,78 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/portal/configmap.yaml b/charts/harbor/harbor/1.13.0/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.13.0/templates/portal/deployment.yaml b/charts/harbor/harbor/1.13.0/templates/portal/deployment.yaml deleted file mode 100644 index 959a3fd7b5..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/portal/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/portal/service.yaml b/charts/harbor/harbor/1.13.0/templates/portal/service.yaml deleted file mode 100644 index ff4eda435b..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/portal/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.13.0/templates/portal/tls.yaml b/charts/harbor/harbor/1.13.0/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/redis/service.yaml b/charts/harbor/harbor/1.13.0/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.13.0/templates/redis/statefulset.yaml deleted file mode 100644 index 371b0fd5aa..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/redis/statefulset.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-dpl.yaml deleted file mode 100644 index fddba9fa8b..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,340 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.jobservice" . }} - key: JOBSERVICE_SECRET - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-secret.yaml deleted file mode 100644 index 529462906e..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if eq $type "swift" }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if eq $type "oss" }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.13.0/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.13.0/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.13.0/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.13.0/templates/trivy/trivy-sts.yaml deleted file mode 100644 index aba23c9e8a..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,222 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.13.0/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.13.0/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.13.0/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.0/values.yaml b/charts/harbor/harbor/1.13.0/values.yaml deleted file mode 100644 index 1160c94ebe..0000000000 --- a/charts/harbor/harbor/1.13.0/values.yaml +++ /dev/null @@ -1,962 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.9.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.9.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.9.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.9.0 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.9.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.9.0 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.9.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.9.0 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.9.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.9.0 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.13.1/.helmignore b/charts/harbor/harbor/1.13.1/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.13.1/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/Chart.yaml b/charts/harbor/harbor/1.13.1/Chart.yaml deleted file mode 100644 index 1203998e16..0000000000 --- a/charts/harbor/harbor/1.13.1/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.9.1 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.13.1 diff --git a/charts/harbor/harbor/1.13.1/LICENSE b/charts/harbor/harbor/1.13.1/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.13.1/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.13.1/README.md b/charts/harbor/harbor/1.13.1/README.md deleted file mode 100644 index f30598cc00..0000000000 --- a/charts/harbor/harbor/1.13.1/README.md +++ /dev/null @@ -1,407 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.13.1/templates/NOTES.txt b/charts/harbor/harbor/1.13.1/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.13.1/templates/_helpers.tpl b/charts/harbor/harbor/1.13.1/templates/_helpers.tpl deleted file mode 100644 index 6ee24fee80..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/_helpers.tpl +++ /dev/null @@ -1,554 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- .Values.database.internal.password -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-cm.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-cm.yaml deleted file mode 100644 index 7d284c899d..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-cm.yaml +++ /dev/null @@ -1,87 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration | quote }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-dpl.yaml deleted file mode 100644 index 8d202498db..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-dpl.yaml +++ /dev/null @@ -1,237 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: "{{ template "harbor.jobservice" . }}" - key: JOBSERVICE_SECRET - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-secret.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-secret.yaml deleted file mode 100644 index 23b352b475..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-secret.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - secret: {{ .Values.core.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (randAlphaNum 32) | b64enc | quote }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-svc.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.13.1/templates/core/core-tls.yaml b/charts/harbor/harbor/1.13.1/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/database/database-secret.yaml b/charts/harbor/harbor/1.13.1/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.13.1/templates/database/database-ss.yaml b/charts/harbor/harbor/1.13.1/templates/database/database-ss.yaml deleted file mode 100644 index 3b08b07ef1..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/database/database-ss.yaml +++ /dev/null @@ -1,168 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.13.1/templates/database/database-svc.yaml b/charts/harbor/harbor/1.13.1/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.13.1/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.13.1/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 6d2e1f53ac..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,139 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.13.1/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.13.1/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.13.1/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.13.1/templates/ingress/ingress.yaml deleted file mode 100644 index e4c06939c6..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/ingress/ingress.yaml +++ /dev/null @@ -1,145 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/ingress/secret.yaml b/charts/harbor/harbor/1.13.1/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.13.1/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 32df97db76..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,166 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index 3dfa6bd5e6..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.13.1/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.13.1/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.13.1/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.13.1/templates/nginx/deployment.yaml deleted file mode 100644 index 8290d497b6..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/nginx/deployment.yaml +++ /dev/null @@ -1,126 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/nginx/secret.yaml b/charts/harbor/harbor/1.13.1/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/nginx/service.yaml b/charts/harbor/harbor/1.13.1/templates/nginx/service.yaml deleted file mode 100644 index 12021bfd1a..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/nginx/service.yaml +++ /dev/null @@ -1,78 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/portal/configmap.yaml b/charts/harbor/harbor/1.13.1/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.13.1/templates/portal/deployment.yaml b/charts/harbor/harbor/1.13.1/templates/portal/deployment.yaml deleted file mode 100644 index 959a3fd7b5..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/portal/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/portal/service.yaml b/charts/harbor/harbor/1.13.1/templates/portal/service.yaml deleted file mode 100644 index ff4eda435b..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/portal/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.13.1/templates/portal/tls.yaml b/charts/harbor/harbor/1.13.1/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/redis/service.yaml b/charts/harbor/harbor/1.13.1/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.13.1/templates/redis/statefulset.yaml deleted file mode 100644 index 371b0fd5aa..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/redis/statefulset.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-dpl.yaml deleted file mode 100644 index b9c97ff892..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,347 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.core" . }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ template "harbor.jobservice" . }} - key: JOBSERVICE_SECRET - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-secret.yaml deleted file mode 100644 index 529462906e..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (randAlphaNum 16) | b64enc | quote }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if eq $type "swift" }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if eq $type "oss" }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.13.1/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.13.1/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.13.1/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.13.1/templates/trivy/trivy-sts.yaml deleted file mode 100644 index aba23c9e8a..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,222 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.13.1/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.13.1/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.13.1/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.13.1/values.yaml b/charts/harbor/harbor/1.13.1/values.yaml deleted file mode 100644 index 3da298bc49..0000000000 --- a/charts/harbor/harbor/1.13.1/values.yaml +++ /dev/null @@ -1,963 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.9.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.9.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.9.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.9.1 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.9.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.9.1 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.9.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.9.1 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.9.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.9.1 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.14.0/.helmignore b/charts/harbor/harbor/1.14.0/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.14.0/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/Chart.yaml b/charts/harbor/harbor/1.14.0/Chart.yaml deleted file mode 100644 index c2acd24b28..0000000000 --- a/charts/harbor/harbor/1.14.0/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.10.0 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.14.0 diff --git a/charts/harbor/harbor/1.14.0/LICENSE b/charts/harbor/harbor/1.14.0/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.14.0/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.14.0/README.md b/charts/harbor/harbor/1.14.0/README.md deleted file mode 100644 index c69f54c035..0000000000 --- a/charts/harbor/harbor/1.14.0/README.md +++ /dev/null @@ -1,408 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.serviceAnnotations` | Annotations to add to the portal service | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.14.0/templates/NOTES.txt b/charts/harbor/harbor/1.14.0/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.14.0/templates/_helpers.tpl b/charts/harbor/harbor/1.14.0/templates/_helpers.tpl deleted file mode 100644 index 8fce623dbc..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/_helpers.tpl +++ /dev/null @@ -1,566 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helper for printing values from existing secrets*/}} -{{- define "harbor.secretKeyHelper" -}} - {{- if and (not (empty .data)) (hasKey .data .key) }} - {{- index .data .key | b64dec -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.database" .) -}} - {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "POSTGRES_PASSWORD") -}} - {{- .Values.database.internal.password | default (index $existingSecret.data "POSTGRES_PASSWORD") | b64dec -}} - {{- else -}} - {{- .Values.database.internal.password -}} - {{- end -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-cm.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-cm.yaml deleted file mode 100644 index 65237eb00a..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-cm.yaml +++ /dev/null @@ -1,87 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration | quote }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-dpl.yaml deleted file mode 100644 index 9a92b45a4f..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-dpl.yaml +++ /dev/null @@ -1,248 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - {{- if .Values.core.existingXsrfSecret }} - - name: CSRF_KEY - valueFrom: - secretKeyRef: - name: {{ .Values.core.existingXsrfSecret }} - key: {{ .Values.core.existingXsrfSecretKey }} - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-secret.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-secret.yaml deleted file mode 100644 index 62a41fce80..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-secret.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingSecret }} - secret: {{ .Values.core.secret | default (include "harbor.secretKeyHelper" (dict "key" "secret" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingXsrfSecret }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (include "harbor.secretKeyHelper" (dict "key" "CSRF_KEY" "data" $existingSecret.data)) | default (randAlphaNum 32) | b64enc | quote }} - {{- end }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-svc.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.14.0/templates/core/core-tls.yaml b/charts/harbor/harbor/1.14.0/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/database/database-secret.yaml b/charts/harbor/harbor/1.14.0/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.14.0/templates/database/database-ss.yaml b/charts/harbor/harbor/1.14.0/templates/database/database-ss.yaml deleted file mode 100644 index 3b08b07ef1..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/database/database-ss.yaml +++ /dev/null @@ -1,168 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.0/templates/database/database-svc.yaml b/charts/harbor/harbor/1.14.0/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.14.0/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.14.0/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 6d2e1f53ac..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,139 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.14.0/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.14.0/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.14.0/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.14.0/templates/ingress/ingress.yaml deleted file mode 100644 index e4c06939c6..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/ingress/ingress.yaml +++ /dev/null @@ -1,145 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/ingress/secret.yaml b/charts/harbor/harbor/1.14.0/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.14.0/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index e39e77e6ed..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,173 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - {{- if .Values.jobservice.existingSecret }} - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index eeb00bde00..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.jobservice.existingSecret }} - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (include "harbor.secretKeyHelper" (dict "key" "JOBSERVICE_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.14.0/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.14.0/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.14.0/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.14.0/templates/nginx/deployment.yaml deleted file mode 100644 index 8290d497b6..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/nginx/deployment.yaml +++ /dev/null @@ -1,126 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/nginx/secret.yaml b/charts/harbor/harbor/1.14.0/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/nginx/service.yaml b/charts/harbor/harbor/1.14.0/templates/nginx/service.yaml deleted file mode 100644 index 205a805ea4..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/nginx/service.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - {{- if .Values.expose.clusterIP.staticClusterIP }} - clusterIP: {{ .Values.expose.clusterIP.staticClusterIP }} - {{- end }} - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/portal/configmap.yaml b/charts/harbor/harbor/1.14.0/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.14.0/templates/portal/deployment.yaml b/charts/harbor/harbor/1.14.0/templates/portal/deployment.yaml deleted file mode 100644 index 959a3fd7b5..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/portal/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/portal/service.yaml b/charts/harbor/harbor/1.14.0/templates/portal/service.yaml deleted file mode 100644 index d00026da46..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/portal/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.portal.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.14.0/templates/portal/tls.yaml b/charts/harbor/harbor/1.14.0/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/redis/service.yaml b/charts/harbor/harbor/1.14.0/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.14.0/templates/redis/statefulset.yaml deleted file mode 100644 index 371b0fd5aa..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/redis/statefulset.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-dpl.yaml deleted file mode 100644 index dc4a833477..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,419 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-secret.yaml deleted file mode 100644 index e853a9cbec..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.registry" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.registry.existingSecret }} - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (include "harbor.secretKeyHelper" (dict "key" "REGISTRY_HTTP_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "swift") (not ($storage.swift.existingSecret)) }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "oss") ((not ($storage.oss.existingSecret))) }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.14.0/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.14.0/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.14.0/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.14.0/templates/trivy/trivy-sts.yaml deleted file mode 100644 index aba23c9e8a..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,222 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.14.0/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.14.0/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.14.0/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.0/values.yaml b/charts/harbor/harbor/1.14.0/values.yaml deleted file mode 100644 index 4edd63fa8c..0000000000 --- a/charts/harbor/harbor/1.14.0/values.yaml +++ /dev/null @@ -1,987 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # The ip address of the ClusterIP service (leave empty for acquiring dynamic ip) - staticClusterIP: "" - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - # keys in existing secret must be REGISTRY_STORAGE_SWIFT_PASSWORD, REGISTRY_STORAGE_SWIFT_SECRETKEY, REGISTRY_STORAGE_SWIFT_ACCESSKEY - existingSecret: "" - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - # key in existingSecret must be REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - existingSecret: "" - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.10.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.10.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.10.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. Alternatively set existingSecret to use an existing secret - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # If using existingSecret, the key must be secret - existingSecret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - # If using existingSecret, the key is defined by core.existingXsrfSecretKey - existingXsrfSecret: "" - # If using existingSecret, the key - existingXsrfSecretKey: CSRF_KEY - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.10.0 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the job service secret - existingSecretKey: JOBSERVICE_SECRET - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.10.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.10.0 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the registry service secret - existingSecretKey: REGISTRY_HTTP_SECRET - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - htpasswdString: "" - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.10.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.10.0 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.10.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.10.0 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.14.1/.helmignore b/charts/harbor/harbor/1.14.1/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.14.1/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/Chart.yaml b/charts/harbor/harbor/1.14.1/Chart.yaml deleted file mode 100644 index e077f02120..0000000000 --- a/charts/harbor/harbor/1.14.1/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.10.1 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.14.1 diff --git a/charts/harbor/harbor/1.14.1/LICENSE b/charts/harbor/harbor/1.14.1/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.14.1/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.14.1/README.md b/charts/harbor/harbor/1.14.1/README.md deleted file mode 100644 index 472324a3ff..0000000000 --- a/charts/harbor/harbor/1.14.1/README.md +++ /dev/null @@ -1,411 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.serviceAnnotations` | Annotations to add to the portal service | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| `core.gdpr.auditLogsCompliant` | Enable GDPR compliant for audit logs by changing username to its CRC32 value if that user was deleted from the system | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.skipJavaDBUpdate` | If the flag is enabled you have to manually download the `trivy-java.db` file [Trivy Java DB][trivy-java-db] and mount it in the `/home/scanner/.cache/trivy/java-db/trivy-java.db` path | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-java-db]: https://github.com/aquasecurity/trivy-java-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.14.1/templates/NOTES.txt b/charts/harbor/harbor/1.14.1/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.14.1/templates/_helpers.tpl b/charts/harbor/harbor/1.14.1/templates/_helpers.tpl deleted file mode 100644 index b3430a1f36..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/_helpers.tpl +++ /dev/null @@ -1,566 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helper for printing values from existing secrets*/}} -{{- define "harbor.secretKeyHelper" -}} - {{- if and (not (empty .data)) (hasKey .data .key) }} - {{- index .data .key | b64dec -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.database" .) -}} - {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "POSTGRES_PASSWORD") -}} - {{- .Values.database.internal.password | default (index $existingSecret.data "POSTGRES_PASSWORD" | b64dec) -}} - {{- else -}} - {{- .Values.database.internal.password -}} - {{- end -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-cm.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-cm.yaml deleted file mode 100644 index 93cab01b4c..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-cm.yaml +++ /dev/null @@ -1,90 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration | quote }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- if .Values.core.gdpr.auditLogsCompliant}} - GDPR_AUDIT_LOGS: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-dpl.yaml deleted file mode 100644 index 9a92b45a4f..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-dpl.yaml +++ /dev/null @@ -1,248 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - {{- if .Values.core.existingXsrfSecret }} - - name: CSRF_KEY - valueFrom: - secretKeyRef: - name: {{ .Values.core.existingXsrfSecret }} - key: {{ .Values.core.existingXsrfSecretKey }} - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-secret.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-secret.yaml deleted file mode 100644 index 62a41fce80..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-secret.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingSecret }} - secret: {{ .Values.core.secret | default (include "harbor.secretKeyHelper" (dict "key" "secret" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingXsrfSecret }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (include "harbor.secretKeyHelper" (dict "key" "CSRF_KEY" "data" $existingSecret.data)) | default (randAlphaNum 32) | b64enc | quote }} - {{- end }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-svc.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.14.1/templates/core/core-tls.yaml b/charts/harbor/harbor/1.14.1/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/database/database-secret.yaml b/charts/harbor/harbor/1.14.1/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.14.1/templates/database/database-ss.yaml b/charts/harbor/harbor/1.14.1/templates/database/database-ss.yaml deleted file mode 100644 index 3b08b07ef1..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/database/database-ss.yaml +++ /dev/null @@ -1,168 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.1/templates/database/database-svc.yaml b/charts/harbor/harbor/1.14.1/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.14.1/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.14.1/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 6d2e1f53ac..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,139 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.14.1/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.14.1/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.14.1/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.14.1/templates/ingress/ingress.yaml deleted file mode 100644 index e4c06939c6..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/ingress/ingress.yaml +++ /dev/null @@ -1,145 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/ingress/secret.yaml b/charts/harbor/harbor/1.14.1/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.14.1/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index e39e77e6ed..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,173 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - {{- if .Values.jobservice.existingSecret }} - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index eeb00bde00..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.jobservice.existingSecret }} - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (include "harbor.secretKeyHelper" (dict "key" "JOBSERVICE_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.14.1/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.14.1/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.14.1/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.14.1/templates/nginx/deployment.yaml deleted file mode 100644 index 8290d497b6..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/nginx/deployment.yaml +++ /dev/null @@ -1,126 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/nginx/secret.yaml b/charts/harbor/harbor/1.14.1/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/nginx/service.yaml b/charts/harbor/harbor/1.14.1/templates/nginx/service.yaml deleted file mode 100644 index 205a805ea4..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/nginx/service.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - {{- if .Values.expose.clusterIP.staticClusterIP }} - clusterIP: {{ .Values.expose.clusterIP.staticClusterIP }} - {{- end }} - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/portal/configmap.yaml b/charts/harbor/harbor/1.14.1/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.14.1/templates/portal/deployment.yaml b/charts/harbor/harbor/1.14.1/templates/portal/deployment.yaml deleted file mode 100644 index 959a3fd7b5..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/portal/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/portal/service.yaml b/charts/harbor/harbor/1.14.1/templates/portal/service.yaml deleted file mode 100644 index d00026da46..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/portal/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.portal.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.14.1/templates/portal/tls.yaml b/charts/harbor/harbor/1.14.1/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/redis/service.yaml b/charts/harbor/harbor/1.14.1/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.14.1/templates/redis/statefulset.yaml deleted file mode 100644 index 371b0fd5aa..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/redis/statefulset.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-dpl.yaml deleted file mode 100644 index dc4a833477..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,419 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-secret.yaml deleted file mode 100644 index e853a9cbec..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.registry" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.registry.existingSecret }} - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (include "harbor.secretKeyHelper" (dict "key" "REGISTRY_HTTP_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "swift") (not ($storage.swift.existingSecret)) }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "oss") ((not ($storage.oss.existingSecret))) }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.14.1/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.14.1/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.14.1/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.14.1/templates/trivy/trivy-sts.yaml deleted file mode 100644 index 7ee4e1068f..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,224 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_JAVA_DB_UPDATE" - value: {{ .Values.trivy.skipJavaDBUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.14.1/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.14.1/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.14.1/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.1/values.yaml b/charts/harbor/harbor/1.14.1/values.yaml deleted file mode 100644 index 49e9d458d6..0000000000 --- a/charts/harbor/harbor/1.14.1/values.yaml +++ /dev/null @@ -1,992 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # The ip address of the ClusterIP service (leave empty for acquiring dynamic ip) - staticClusterIP: "" - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - # keys in existing secret must be REGISTRY_STORAGE_SWIFT_PASSWORD, REGISTRY_STORAGE_SWIFT_SECRETKEY, REGISTRY_STORAGE_SWIFT_ACCESSKEY - existingSecret: "" - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - # key in existingSecret must be REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - existingSecret: "" - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.10.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.10.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.10.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. Alternatively set existingSecret to use an existing secret - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # If using existingSecret, the key must be secret - existingSecret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - # If using existingSecret, the key is defined by core.existingXsrfSecretKey - existingXsrfSecret: "" - # If using existingSecret, the key - existingXsrfSecretKey: CSRF_KEY - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - auditLogsCompliant: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.10.1 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the job service secret - existingSecretKey: JOBSERVICE_SECRET - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.10.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.10.1 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the registry service secret - existingSecretKey: REGISTRY_HTTP_SECRET - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - htpasswdString: "" - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.10.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # skipJavaDBUpdate If the flag is enabled you have to manually download the `trivy-java.db` file and mount it in the - # `/home/scanner/.cache/trivy/java-db/trivy-java.db` path - # - skipJavaDBUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.10.1 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.10.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.10.1 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.14.2/.helmignore b/charts/harbor/harbor/1.14.2/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.14.2/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/Chart.yaml b/charts/harbor/harbor/1.14.2/Chart.yaml deleted file mode 100644 index 1632e628e1..0000000000 --- a/charts/harbor/harbor/1.14.2/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.10.2 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yinw@vmware.com - name: Wenkai Yin -- email: hweiwei@vmware.com - name: Weiwei He -- email: yshengwen@vmware.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.14.2 diff --git a/charts/harbor/harbor/1.14.2/LICENSE b/charts/harbor/harbor/1.14.2/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.14.2/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.14.2/README.md b/charts/harbor/harbor/1.14.2/README.md deleted file mode 100644 index 472324a3ff..0000000000 --- a/charts/harbor/harbor/1.14.2/README.md +++ /dev/null @@ -1,411 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.harbor.annotations` | The annotations specific to harbor ingress | {} | -| `expose.ingress.harbor.labels` | The labels specific to harbor ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -|`persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.serviceAnnotations` | Annotations to add to the portal service | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| `core.gdpr.auditLogsCompliant` | Enable GDPR compliant for audit logs by changing username to its CRC32 value if that user was deleted from the system | `false` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.skipJavaDBUpdate` | If the flag is enabled you have to manually download the `trivy-java.db` file [Trivy Java DB][trivy-java-db] and mount it in the `/home/scanner/.cache/trivy/java-db/trivy-java.db` path | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-java-db]: https://github.com/aquasecurity/trivy-java-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.14.2/templates/NOTES.txt b/charts/harbor/harbor/1.14.2/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.14.2/templates/_helpers.tpl b/charts/harbor/harbor/1.14.2/templates/_helpers.tpl deleted file mode 100644 index b3430a1f36..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/_helpers.tpl +++ /dev/null @@ -1,566 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helper for printing values from existing secrets*/}} -{{- define "harbor.secretKeyHelper" -}} - {{- if and (not (empty .data)) (hasKey .data .key) }} - {{- index .data .key | b64dec -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.database" .) -}} - {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "POSTGRES_PASSWORD") -}} - {{- .Values.database.internal.password | default (index $existingSecret.data "POSTGRES_PASSWORD" | b64dec) -}} - {{- else -}} - {{- .Values.database.internal.password -}} - {{- end -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-cm.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-cm.yaml deleted file mode 100644 index 93cab01b4c..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-cm.yaml +++ /dev/null @@ -1,90 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration | quote }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- if .Values.core.gdpr.auditLogsCompliant}} - GDPR_AUDIT_LOGS: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-dpl.yaml deleted file mode 100644 index 9a92b45a4f..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-dpl.yaml +++ /dev/null @@ -1,248 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - {{- if .Values.core.existingXsrfSecret }} - - name: CSRF_KEY - valueFrom: - secretKeyRef: - name: {{ .Values.core.existingXsrfSecret }} - key: {{ .Values.core.existingXsrfSecretKey }} - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index 43c9d3596d..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,74 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-secret.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-secret.yaml deleted file mode 100644 index 62a41fce80..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-secret.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingSecret }} - secret: {{ .Values.core.secret | default (include "harbor.secretKeyHelper" (dict "key" "secret" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingXsrfSecret }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (include "harbor.secretKeyHelper" (dict "key" "CSRF_KEY" "data" $existingSecret.data)) | default (randAlphaNum 32) | b64enc | quote }} - {{- end }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-svc.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.14.2/templates/core/core-tls.yaml b/charts/harbor/harbor/1.14.2/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/database/database-secret.yaml b/charts/harbor/harbor/1.14.2/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.14.2/templates/database/database-ss.yaml b/charts/harbor/harbor/1.14.2/templates/database/database-ss.yaml deleted file mode 100644 index 3b08b07ef1..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/database/database-ss.yaml +++ /dev/null @@ -1,168 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # as we change the data directory to a sub folder to support psp, the init container here - # is used to migrate the existing data. See https://github.com/goharbor/harbor-helm/issues/756 - # for more detail. - # we may remove it after several releases - - name: "data-migrator" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "[ -e /var/lib/postgresql/data/postgresql.conf ] && [ ! -d /var/lib/postgresql/data/pgdata ] && mkdir -m 0700 /var/lib/postgresql/data/pgdata && mv /var/lib/postgresql/data/* /var/lib/postgresql/data/pgdata/ || true"] -{{- if .Values.database.internal.initContainer.migrator.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.migrator.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.2/templates/database/database-svc.yaml b/charts/harbor/harbor/1.14.2/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.14.2/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.14.2/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 6d2e1f53ac..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,139 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.14.2/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.14.2/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.14.2/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.14.2/templates/ingress/ingress.yaml deleted file mode 100644 index e4c06939c6..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/ingress/ingress.yaml +++ /dev/null @@ -1,145 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.harbor.labels }} -{{ toYaml $ingress.harbor.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -{{- if $ingress.harbor.annotations }} -{{ toYaml $ingress.harbor.annotations | indent 4 }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/ingress/secret.yaml b/charts/harbor/harbor/1.14.2/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.14.2/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index e39e77e6ed..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,173 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - {{- if .Values.jobservice.existingSecret }} - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index a6b8b8bd38..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index eeb00bde00..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.jobservice.existingSecret }} - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (include "harbor.secretKeyHelper" (dict "key" "JOBSERVICE_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.14.2/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.14.2/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.14.2/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.14.2/templates/nginx/deployment.yaml deleted file mode 100644 index 8290d497b6..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/nginx/deployment.yaml +++ /dev/null @@ -1,126 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - ports: - - containerPort: 8080 - - containerPort: 8443 - - containerPort: 4443 - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/nginx/secret.yaml b/charts/harbor/harbor/1.14.2/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/nginx/service.yaml b/charts/harbor/harbor/1.14.2/templates/nginx/service.yaml deleted file mode 100644 index 205a805ea4..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/nginx/service.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - {{- if .Values.expose.clusterIP.staticClusterIP }} - clusterIP: {{ .Values.expose.clusterIP.staticClusterIP }} - {{- end }} - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/portal/configmap.yaml b/charts/harbor/harbor/1.14.2/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.14.2/templates/portal/deployment.yaml b/charts/harbor/harbor/1.14.2/templates/portal/deployment.yaml deleted file mode 100644 index 959a3fd7b5..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/portal/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/portal/service.yaml b/charts/harbor/harbor/1.14.2/templates/portal/service.yaml deleted file mode 100644 index d00026da46..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/portal/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.portal.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.14.2/templates/portal/tls.yaml b/charts/harbor/harbor/1.14.2/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/redis/service.yaml b/charts/harbor/harbor/1.14.2/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.14.2/templates/redis/statefulset.yaml deleted file mode 100644 index 371b0fd5aa..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/redis/statefulset.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-dpl.yaml deleted file mode 100644 index dc4a833477..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,419 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: 5001 - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-pvc.yaml deleted file mode 100644 index 2112e22877..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-secret.yaml deleted file mode 100644 index e853a9cbec..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.registry" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.registry.existingSecret }} - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (include "harbor.secretKeyHelper" (dict "key" "REGISTRY_HTTP_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "swift") (not ($storage.swift.existingSecret)) }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "oss") ((not ($storage.oss.existingSecret))) }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.14.2/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.14.2/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.14.2/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.14.2/templates/trivy/trivy-sts.yaml deleted file mode 100644 index 7ee4e1068f..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,224 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - securityContext: - privileged: false - allowPrivilegeEscalation: false - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_JAVA_DB_UPDATE" - value: {{ .Values.trivy.skipJavaDBUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.14.2/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.14.2/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.14.2/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.14.2/values.yaml b/charts/harbor/harbor/1.14.2/values.yaml deleted file mode 100644 index 688b42c3ae..0000000000 --- a/charts/harbor/harbor/1.14.2/values.yaml +++ /dev/null @@ -1,992 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - harbor: - # harbor ingress-specific annotations - annotations: {} - # harbor ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # The ip address of the ClusterIP service (leave empty for acquiring dynamic ip) - staticClusterIP: "" - # Annotations on the ClusterIP service - annotations: {} - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - annotations: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - # keys in existing secret must be REGISTRY_STORAGE_SWIFT_PASSWORD, REGISTRY_STORAGE_SWIFT_SECRETKEY, REGISTRY_STORAGE_SWIFT_ACCESSKEY - existingSecret: "" - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - # key in existingSecret must be REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - existingSecret: "" - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.10.2 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.10.2 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - -core: - image: - repository: goharbor/harbor-core - tag: v2.10.2 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. Alternatively set existingSecret to use an existing secret - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # If using existingSecret, the key must be secret - existingSecret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - # If using existingSecret, the key is defined by core.existingXsrfSecretKey - existingXsrfSecret: "" - # If using existingSecret, the key - existingXsrfSecretKey: CSRF_KEY - ## The priority class to run the pod as - priorityClassName: - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - auditLogsCompliant: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.10.2 - replicas: 1 - revisionHistoryLimit: 10 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the job service secret - existingSecretKey: JOBSERVICE_SECRET - ## The priority class to run the pod as - priorityClassName: - -registry: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - registry: - image: - repository: goharbor/registry-photon - tag: v2.10.2 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.10.2 - - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the registry service secret - existingSecretKey: REGISTRY_HTTP_SECRET - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - htpasswdString: "" - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.10.2 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # skipJavaDBUpdate If the flag is enabled you have to manually download the `trivy-java.db` file and mount it in the - # `/home/scanner/.cache/trivy/java-db/trivy-java.db` path - # - skipJavaDBUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-db - tag: v2.10.2 - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for postgre of harbor. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/redis-photon - tag: v2.10.2 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - image: - repository: goharbor/harbor-exporter - tag: v2.10.2 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 - ## The priority class to run the pod as - priorityClassName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 diff --git a/charts/harbor/harbor/1.15.0/.helmignore b/charts/harbor/harbor/1.15.0/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.15.0/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/Chart.yaml b/charts/harbor/harbor/1.15.0/Chart.yaml deleted file mode 100644 index 044f3b1b10..0000000000 --- a/charts/harbor/harbor/1.15.0/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.11.0 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png -keywords: -- docker -- registry -- harbor -maintainers: -- email: yan-yw.wang@broadcom.com - name: Yan Wang -- email: wenkai.yin@broadcom.com - name: Wenkai Yin -- email: miner.yang@broadcom.com - name: Miner Yang -- email: shengwen.yu@broadcom.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.15.0 diff --git a/charts/harbor/harbor/1.15.0/LICENSE b/charts/harbor/harbor/1.15.0/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.15.0/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.15.0/README.md b/charts/harbor/harbor/1.15.0/README.md deleted file mode 100644 index a78cfa6700..0000000000 --- a/charts/harbor/harbor/1.15.0/README.md +++ /dev/null @@ -1,422 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -|-----------------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.labels` | The labels specific to ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.clusterIP.annotations` | The annotations used commonly for clusterIP | | -| `expose.clusterIP.labels` | The labels specific to clusterIP | {} | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.nodePort.annotations` | The annotations used commonly for nodePort | | -| `expose.nodePort.labels` | The labels specific to nodePort | {} | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.labels` | The labels specific to loadBalancer | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.serviceAnnotations` | Annotations to add to the portal service | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| `portal.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| `core.gdpr.auditLogsCompliant` | Enable GDPR compliant for audit logs by changing username to its CRC32 value if that user was deleted from the system | `false` | -| `core.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `jobservice.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| `registry.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.skipJavaDBUpdate` | If the flag is enabled you have to manually download the `trivy-java.db` file [Trivy Java DB][trivy-java-db] and mount it in the `/home/scanner/.cache/trivy/java-db/trivy-java.db` path | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| `trivy.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.internal.extrInitContainers` | Extra init containers to be run before the database's container starts. | `[]` | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.internal.initContainers` | Init containers to be run before the redis's container starts. | `[]` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-java-db]: https://github.com/aquasecurity/trivy-java-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.15.0/templates/NOTES.txt b/charts/harbor/harbor/1.15.0/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.15.0/templates/_helpers.tpl b/charts/harbor/harbor/1.15.0/templates/_helpers.tpl deleted file mode 100644 index f6249b3993..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/_helpers.tpl +++ /dev/null @@ -1,581 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels: legacy */}} -{{- define "harbor.legacy.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/name: {{ include "harbor.name" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: {{ include "harbor.name" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helper for printing values from existing secrets*/}} -{{- define "harbor.secretKeyHelper" -}} - {{- if and (not (empty .data)) (hasKey .data .key) }} - {{- index .data .key | b64dec -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.database" .) -}} - {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "POSTGRES_PASSWORD") -}} - {{- .Values.database.internal.password | default (index $existingSecret.data "POSTGRES_PASSWORD" | b64dec) -}} - {{- else -}} - {{- .Values.database.internal.password -}} - {{- end -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-cm.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-cm.yaml deleted file mode 100644 index 93cab01b4c..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-cm.yaml +++ /dev/null @@ -1,90 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration | quote }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- if .Values.core.gdpr.auditLogsCompliant}} - GDPR_AUDIT_LOGS: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-dpl.yaml deleted file mode 100644 index 2ee8fd59c2..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-dpl.yaml +++ /dev/null @@ -1,257 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core - app.kubernetes.io/component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: core - app.kubernetes.io/component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - {{- with .Values.core.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - {{- if .Values.core.existingXsrfSecret }} - - name: CSRF_KEY - valueFrom: - secretKeyRef: - name: {{ .Values.core.existingXsrfSecret }} - key: {{ .Values.core.existingXsrfSecretKey }} - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index ce0b13134d..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,77 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-secret.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-secret.yaml deleted file mode 100644 index 62a41fce80..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-secret.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingSecret }} - secret: {{ .Values.core.secret | default (include "harbor.secretKeyHelper" (dict "key" "secret" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingXsrfSecret }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (include "harbor.secretKeyHelper" (dict "key" "CSRF_KEY" "data" $existingSecret.data)) | default (randAlphaNum 32) | b64enc | quote }} - {{- end }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-svc.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.15.0/templates/core/core-tls.yaml b/charts/harbor/harbor/1.15.0/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/database/database-secret.yaml b/charts/harbor/harbor/1.15.0/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.15.0/templates/database/database-ss.yaml b/charts/harbor/harbor/1.15.0/templates/database/database-ss.yaml deleted file mode 100644 index 71c5eb1e08..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/database/database-ss.yaml +++ /dev/null @@ -1,162 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database - app.kubernetes.io/component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database - app.kubernetes.io/component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - {{- with .Values.database.internal.extrInitContainers }} - {{- toYaml . | nindent 6 }} - {{- end }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.15.0/templates/database/database-svc.yaml b/charts/harbor/harbor/1.15.0/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.15.0/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.15.0/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 01e9258ea9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,146 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter - app.kubernetes.io/component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter - app.kubernetes.io/component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/exporter/exporter-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/exporter/exporter-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: {{ .Values.metrics.exporter.port }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.15.0/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.15.0/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.15.0/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.15.0/templates/ingress/ingress.yaml deleted file mode 100644 index 73472c6056..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/ingress/ingress.yaml +++ /dev/null @@ -1,142 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.labels }} -{{ toYaml $ingress.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/ingress/secret.yaml b/charts/harbor/harbor/1.15.0/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.15.0/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 1bb6690824..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,182 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice - app.kubernetes.io/component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice - app.kubernetes.io/component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - {{- with .Values.jobservice.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - {{- if .Values.jobservice.existingSecret }} - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index 3f7d00b671..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice - app.kubernetes.io/component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index eeb00bde00..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.jobservice.existingSecret }} - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (include "harbor.secretKeyHelper" (dict "key" "JOBSERVICE_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.15.0/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.15.0/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.15.0/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.15.0/templates/nginx/deployment.yaml deleted file mode 100644 index 3abc941989..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/nginx/deployment.yaml +++ /dev/null @@ -1,132 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx - app.kubernetes.io/component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx - app.kubernetes.io/component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: 8080 - {{- if .Values.expose.tls.enabled }} - - containerPort: 8443 - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/nginx/secret.yaml b/charts/harbor/harbor/1.15.0/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/nginx/service.yaml b/charts/harbor/harbor/1.15.0/templates/nginx/service.yaml deleted file mode 100644 index 691584ce02..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/nginx/service.yaml +++ /dev/null @@ -1,94 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.clusterIP.labels }} -{{ toYaml $clusterIP.labels | indent 4 }} -{{- end }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - {{- if .Values.expose.clusterIP.staticClusterIP }} - clusterIP: {{ .Values.expose.clusterIP.staticClusterIP }} - {{- end }} - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.nodePort.labels }} -{{ toYaml $nodePort.labels | indent 4 }} -{{- end }} -{{- with $nodePort.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.loadBalancer.labels }} -{{ toYaml $loadBalancer.labels | indent 4 }} -{{- end }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/portal/configmap.yaml b/charts/harbor/harbor/1.15.0/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.15.0/templates/portal/deployment.yaml b/charts/harbor/harbor/1.15.0/templates/portal/deployment.yaml deleted file mode 100644 index 4dea944382..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/portal/deployment.yaml +++ /dev/null @@ -1,123 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal - app.kubernetes.io/component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: portal - app.kubernetes.io/component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - {{- with .Values.portal.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/portal/service.yaml b/charts/harbor/harbor/1.15.0/templates/portal/service.yaml deleted file mode 100644 index d00026da46..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/portal/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.portal.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.15.0/templates/portal/tls.yaml b/charts/harbor/harbor/1.15.0/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/redis/service.yaml b/charts/harbor/harbor/1.15.0/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.15.0/templates/redis/statefulset.yaml deleted file mode 100644 index 1d37fb184b..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/redis/statefulset.yaml +++ /dev/null @@ -1,125 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis - app.kubernetes.io/component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis - app.kubernetes.io/component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - {{- with .Values.redis.internal.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-dpl.yaml deleted file mode 100644 index 0965cf2e2a..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,431 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry - app.kubernetes.io/component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry - app.kubernetes.io/component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - {{- with .Values.registry.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: {{ ternary .Values.metrics.registry.port 5001 .Values.metrics.enabled }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-pvc.yaml deleted file mode 100644 index 5d6d4d3ddf..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry - app.kubernetes.io/component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-secret.yaml deleted file mode 100644 index e853a9cbec..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.registry" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.registry.existingSecret }} - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (include "harbor.secretKeyHelper" (dict "key" "REGISTRY_HTTP_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "swift") (not ($storage.swift.existingSecret)) }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "oss") ((not ($storage.oss.existingSecret))) }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.15.0/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.15.0/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.15.0/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.15.0/templates/trivy/trivy-sts.yaml deleted file mode 100644 index c876ba3878..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,230 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy - app.kubernetes.io/component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy - app.kubernetes.io/component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - {{- with .Values.trivy.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 12 }} - {{- end }} - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_JAVA_DB_UPDATE" - value: {{ .Values.trivy.skipJavaDBUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.15.0/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.15.0/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.15.0/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.0/values.yaml b/charts/harbor/harbor/1.15.0/values.yaml deleted file mode 100644 index 529ec928b7..0000000000 --- a/charts/harbor/harbor/1.15.0/values.yaml +++ /dev/null @@ -1,1058 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - # ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # The ip address of the ClusterIP service (leave empty for acquiring dynamic ip) - staticClusterIP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # Annotations on the ClusterIP service - annotations: {} - # ClusterIP-specific labels - labels: {} - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - # Annotations on the nodePort service - annotations: {} - # nodePort-specific labels - labels: {} - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # Annotations on the loadBalancer service - annotations: {} - # loadBalancer-specific labels - labels: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - # keys in existing secret must be REGISTRY_STORAGE_SWIFT_PASSWORD, REGISTRY_STORAGE_SWIFT_SECRETKEY, REGISTRY_STORAGE_SWIFT_ACCESSKEY - existingSecret: "" - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - # key in existingSecret must be REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - existingSecret: "" - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 - -## set Container Security Context to comply with PSP restricted policy if necessary -## each of the conatiner will apply the same security context -## containerSecurityContext:{} is initially an empty yaml that you could edit it on demand, we just filled with a common template for convenience -containerSecurityContext: - privileged: false - allowPrivilegeEscalation: false - seccompProfile: - type: RuntimeDefault - runAsNonRoot: true - capabilities: - drop: - - ALL - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - -core: - image: - repository: goharbor/harbor-core - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. Alternatively set existingSecret to use an existing secret - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # If using existingSecret, the key must be secret - existingSecret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - # If using existingSecret, the key is defined by core.existingXsrfSecretKey - existingXsrfSecret: "" - # If using existingSecret, the key - existingXsrfSecretKey: CSRF_KEY - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - auditLogsCompliant: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the job service secret - existingSecretKey: JOBSERVICE_SECRET - -registry: - registry: - image: - repository: goharbor/registry-photon - tag: v2.11.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.11.0 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the registry service secret - existingSecretKey: REGISTRY_HTTP_SECRET - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - htpasswdString: "" - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # skipJavaDBUpdate If the flag is enabled you have to manually download the `trivy-java.db` file and mount it in the - # `/home/scanner/.cache/trivy/java-db/trivy-java.db` path - # - skipJavaDBUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - image: - repository: goharbor/harbor-db - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - extrInitContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for harbor's postgres. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - image: - repository: goharbor/redis-photon - tag: v2.11.0 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - image: - repository: goharbor/harbor-exporter - tag: v2.11.0 - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - ## The priority class to run the pod as - priorityClassName: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 diff --git a/charts/harbor/harbor/1.15.1/.helmignore b/charts/harbor/harbor/1.15.1/.helmignore deleted file mode 100644 index b4424fd59b..0000000000 --- a/charts/harbor/harbor/1.15.1/.helmignore +++ /dev/null @@ -1,6 +0,0 @@ -.github/* -docs/* -.git/* -.gitignore -CONTRIBUTING.md -test/* \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/Chart.yaml b/charts/harbor/harbor/1.15.1/Chart.yaml deleted file mode 100644 index 32f6cd1f68..0000000000 --- a/charts/harbor/harbor/1.15.1/Chart.yaml +++ /dev/null @@ -1,30 +0,0 @@ -annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor -apiVersion: v1 -appVersion: 2.11.1 -description: An open source trusted cloud native registry that stores, signs, and - scans content -home: https://goharbor.io -icon: file://assets/icons/harbor.png -keywords: -- docker -- registry -- harbor -kubeVersion: '>=1.20-0' -maintainers: -- email: yan-yw.wang@broadcom.com - name: Yan Wang -- email: wenkai.yin@broadcom.com - name: Wenkai Yin -- email: miner.yang@broadcom.com - name: Miner Yang -- email: shengwen.yu@broadcom.com - name: Shengwen Yu -name: harbor -sources: -- https://github.com/goharbor/harbor -- https://github.com/goharbor/harbor-helm -version: 1.15.1 diff --git a/charts/harbor/harbor/1.15.1/LICENSE b/charts/harbor/harbor/1.15.1/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/charts/harbor/harbor/1.15.1/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/charts/harbor/harbor/1.15.1/README.md b/charts/harbor/harbor/1.15.1/README.md deleted file mode 100644 index a78cfa6700..0000000000 --- a/charts/harbor/harbor/1.15.1/README.md +++ /dev/null @@ -1,422 +0,0 @@ -# Helm Chart for Harbor - -**Notes:** The master branch is in heavy development, please use the other stable versions instead. A highly available solution for Harbor based on chart can be found [here](docs/High%20Availability.md). And refer to the [guide](docs/Upgrade.md) to upgrade the existing deployment. - -This repository, including the issues, focuses on deploying Harbor chart via helm. For functionality issues or Harbor questions, please open issues on [goharbor/harbor](https://github.com/goharbor/harbor) - -## Introduction - -This [Helm](https://github.com/kubernetes/helm) chart installs [Harbor](https://github.com/goharbor/harbor) in a Kubernetes cluster. Welcome to [contribute](CONTRIBUTING.md) to Helm Chart for Harbor. - -## Prerequisites - -- Kubernetes cluster 1.20+ -- Helm v3.2.0+ - -## Installation - -### Add Helm repository - -```bash -helm repo add harbor https://helm.goharbor.io -``` - -### Configure the chart - -The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first). - -#### Configure how to expose Harbor service - -- **Ingress**: The ingress controller must be installed in the Kubernetes cluster. - **Notes:** if TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to issue [#5291](https://github.com/goharbor/harbor/issues/5291) for details. -- **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster. -- **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`. -- **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer. - -#### Configure the external URL - -The external URL for Harbor core service is used to: - -1. populate the docker/helm commands showed on portal -2. populate the token service URL returned to docker client - -Format: `protocol://domain[:port]`. Usually: - -- if service exposed via `Ingress`, the `domain` should be the value of `expose.ingress.hosts.core` -- if service exposed via `ClusterIP`, the `domain` should be the value of `expose.clusterIP.name` -- if service exposed via `NodePort`, the `domain` should be the IP address of one Kubernetes node -- if service exposed via `LoadBalancer`, set the `domain` as your own domain name and add a CNAME record to map the domain name to the one you got from the cloud provider - -If Harbor is deployed behind the proxy, set it as the URL of proxy. - -#### Configure how to persist data - -- **Disable**: The data does not survive the termination of a pod. -- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you already have existing persistent volumes to use. -- **External Storage(only for images and charts)**: For images and charts, the external storages are supported: `azure`, `gcs`, `s3` `swift` and `oss`. - -#### Configure the other items listed in [configuration](#configuration) section - -### Install the chart - -Install the Harbor helm chart with a release name `my-release`: -```bash -helm install my-release harbor/harbor -``` - -## Uninstallation - -To uninstall/delete the `my-release` deployment: -```bash -helm uninstall my-release -``` - -## Configuration - -The following table lists the configurable parameters of the Harbor chart and the default values. - -| Parameter | Description | Default | -|-----------------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| **Expose** | | | -| `expose.type` | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped. | `ingress` | -| `expose.tls.enabled` | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details. | `true` | -| `expose.tls.certSource` | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option | `auto` | -| `expose.tls.auto.commonName` | The common name used to generate the certificate, it's necessary when the type isn't `ingress` | | -| `expose.tls.secret.secretName` | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key | | -| `expose.ingress.hosts.core` | The host of Harbor core service in ingress rule | `core.harbor.domain` | -| `expose.ingress.controller` | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp` | `default` | -| `expose.ingress.kubeVersionOverride` | Allows the ability to override the kubernetes version used while templating the ingress | | -| `expose.ingress.annotations` | The annotations used commonly for ingresses | | -| `expose.ingress.labels` | The labels specific to ingress | {} | -| `expose.clusterIP.name` | The name of ClusterIP service | `harbor` | -| `expose.clusterIP.annotations` | The annotations attached to the ClusterIP service | {} | -| `expose.clusterIP.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.clusterIP.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.clusterIP.annotations` | The annotations used commonly for clusterIP | | -| `expose.clusterIP.labels` | The labels specific to clusterIP | {} | -| `expose.nodePort.name` | The name of NodePort service | `harbor` | -| `expose.nodePort.ports.http.port` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.nodePort.ports.http.nodePort` | The node port Harbor listens on when serving HTTP | `30002` | -| `expose.nodePort.ports.https.port` | The service port Harbor listens on when serving HTTPS | `443` | -| `expose.nodePort.ports.https.nodePort` | The node port Harbor listens on when serving HTTPS | `30003` | -| `expose.nodePort.annotations` | The annotations used commonly for nodePort | | -| `expose.nodePort.labels` | The labels specific to nodePort | {} | -| `expose.loadBalancer.name` | The name of service | `harbor` | -| `expose.loadBalancer.IP` | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP | `""` | -| `expose.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving HTTP | `80` | -| `expose.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving HTTPS | `30002` | -| `expose.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | -| `expose.loadBalancer.labels` | The labels specific to loadBalancer | {} | -| `expose.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | -| **Internal TLS** | | | -| `internalTLS.enabled` | Enable TLS for the components (core, jobservice, portal, registry, trivy) | `false` | -| `internalTLS.strong_ssl_ciphers` | Enable strong ssl ciphers for nginx and portal | `false` -| `internalTLS.certSource` | Method to provide TLS for the components, options are `auto`, `manual`, `secret`. | `auto` | -| `internalTLS.trustCa` | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA | | -| `internalTLS.core.secretName` | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.core.crt` | Content of core's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.core.key` | Content of core's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.secretName` | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.jobservice.crt` | Content of jobservice's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.jobservice.key` | Content of jobservice's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.registry.secretName` | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.registry.crt` | Content of registry's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.registry.key` | Content of registry's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.portal.secretName` | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.portal.crt` | Content of portal's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.portal.key` | Content of portal's TLS key file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.secretName` | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file. | | -| `internalTLS.trivy.crt` | Content of trivy's TLS cert file, only available when `certSource` is `manual` | | -| `internalTLS.trivy.key` | Content of trivy's TLS key file, only available when `certSource` is `manual` | | -| **IPFamily** | | | -| `ipFamily.ipv4.enabled` | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| `ipFamily.ipv6.enabled` | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components ｜ `true` | -| **Persistence** | | | -| `persistence.enabled` | Enable the data persistence or not | `true` | -| `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components. | `keep` | -| `persistence.persistentVolumeClaim.registry.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.registry.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.registry.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.registry.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.registry.size` | The size of the volume | `5Gi` | -| `persistence.persistentVolumeClaim.registry.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.database.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.subPath` | The sub path used in the volume. If external database is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.database.accessMode` | The access mode of the volume. If external database is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.database.size` | The size of the volume. If external database is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.database.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.redis.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.subPath` | The sub path used in the volume. If external Redis is used, the setting will be ignored | | -| `persistence.persistentVolumeClaim.redis.accessMode` | The access mode of the volume. If external Redis is used, the setting will be ignored | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.redis.size` | The size of the volume. If external Redis is used, the setting will be ignored | `1Gi` | -| `persistence.persistentVolumeClaim.redis.annotations` | The annotations of the volume | | -| `persistence.persistentVolumeClaim.trivy.existingClaim` | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components | | -| `persistence.persistentVolumeClaim.trivy.storageClass` | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning | | -| `persistence.persistentVolumeClaim.trivy.subPath` | The sub path used in the volume | | -| `persistence.persistentVolumeClaim.trivy.accessMode` | The access mode of the volume | `ReadWriteOnce` | -| `persistence.persistentVolumeClaim.trivy.size` | The size of the volume | `1Gi` | -| `persistence.persistentVolumeClaim.trivy.annotations` | The annotations of the volume | | -| `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details | `false` | -| `persistence.imageChartStorage.caBundleSecretName` | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers. | | -| `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details | `filesystem` | -| `persistence.imageChartStorage.gcs.existingSecret` | An existing secret containing the gcs service account json key. The key must be gcs-key.json. | `""` | -| `persistence.imageChartStorage.gcs.useWorkloadIdentity` | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account. | `false` | -| **General** | | | -| `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | -| `caBundleSecretName` | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components. | | -| `uaaSecretName` | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`. | | -| `imagePullPolicy` | The image pull policy | | -| `imagePullSecrets` | The imagePullSecrets names for all deployments | | -| `updateStrategy.type` | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported | `RollingUpdate` | -| `logLevel` | The log level: `debug`, `info`, `warning`, `error` or `fatal` | `info` | -| `harborAdminPassword` | The initial password of Harbor admin. Change it from portal after launching Harbor | `Harbor12345` | -| `existingSecretAdminPassword` | The name of secret where admin password can be found. | | -| `existingSecretAdminPasswordKey` | The name of the key in the secret where to find harbor admin password Harbor | `HARBOR_ADMIN_PASSWORD` | -| `caSecretName` | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically | | -| `secretKey` | The key used for encryption. Must be a string of 16 chars | `not-a-secure-key` | -| `existingSecretSecretKey` | An existing secret containing the encoding secretKey | `""` | -| `proxy.httpProxy` | The URL of the HTTP proxy server | | -| `proxy.httpsProxy` | The URL of the HTTPS proxy server | | -| `proxy.noProxy` | The URLs that the proxy settings not apply to | 127.0.0.1,localhost,.local,.internal | -| `proxy.components` | The component list that the proxy settings apply to | core, jobservice, trivy | -| `enableMigrateHelmHook` | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job | `false` | -| **Nginx** (if service exposed via `ingress`, Nginx will not be used) | | | -| `nginx.image.repository` | Image repository | `goharbor/nginx-photon` | -| `nginx.image.tag` | Image tag | `dev` | -| `nginx.replicas` | The replica count | `1` | -| `nginx.revisionHistoryLimit` | The revision history limit | `10` | -| `nginx.resources` | The [resources] to allocate for container | undefined | -| `nginx.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `nginx.nodeSelector` | Node labels for pod assignment | `{}` | -| `nginx.tolerations` | Tolerations for pod assignment | `[]` | -| `nginx.affinity` | Node/Pod affinities | `{}` | -| `nginx.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `nginx.podAnnotations` | Annotations to add to the nginx pod | `{}` | -| `nginx.priorityClassName` | The priority class to run the pod as | | -| **Portal** | | | -| `portal.image.repository` | Repository for portal image | `goharbor/harbor-portal` | -| `portal.image.tag` | Tag for portal image | `dev` | -| `portal.replicas` | The replica count | `1` | -| `portal.revisionHistoryLimit` | The revision history limit | `10` | -| `portal.resources` | The [resources] to allocate for container | undefined | -| `portal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `portal.nodeSelector` | Node labels for pod assignment | `{}` | -| `portal.tolerations` | Tolerations for pod assignment | `[]` | -| `portal.affinity` | Node/Pod affinities | `{}` | -| `portal.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `portal.podAnnotations` | Annotations to add to the portal pod | `{}` | -| `portal.serviceAnnotations` | Annotations to add to the portal service | `{}` | -| `portal.priorityClassName` | The priority class to run the pod as | | -| `portal.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Core** | | | -| `core.image.repository` | Repository for Harbor core image | `goharbor/harbor-core` | -| `core.image.tag` | Tag for Harbor core image | `dev` | -| `core.replicas` | The replica count | `1` | -| `core.revisionHistoryLimit` | The revision history limit | `10` | -| `core.startupProbe.initialDelaySeconds` | The initial delay in seconds for the startup probe | `10` | -| `core.resources` | The [resources] to allocate for container | undefined | -| `core.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `core.nodeSelector` | Node labels for pod assignment | `{}` | -| `core.tolerations` | Tolerations for pod assignment | `[]` | -| `core.affinity` | Node/Pod affinities | `{}` | -| `core.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `core.podAnnotations` | Annotations to add to the core pod | `{}` | -| `core.serviceAnnotations` | Annotations to add to the core service | `{}` | -| `core.configureUserSettings` | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable). | | -| `core.quotaUpdateProvider` | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db` | -| `core.secret` | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `core.secretName` | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set | | -| `core.tokenKey` | PEM-formatted RSA private key used to sign service tokens. Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set. | | -| `core.tokenCert` | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens. Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set. | | -| `core.xsrfKey` | The XSRF key. Will be generated automatically if it isn't specified | | -| `core.priorityClassName` | The priority class to run the pod as | | -| `core.artifactPullAsyncFlushDuration` | The time duration for async update artifact pull_time and repository pull_count | | -| `core.gdpr.deleteUser` | Enable GDPR compliant user delete | `false` | -| `core.gdpr.auditLogsCompliant` | Enable GDPR compliant for audit logs by changing username to its CRC32 value if that user was deleted from the system | `false` | -| `core.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Jobservice** | | | -| `jobservice.image.repository` | Repository for jobservice image | `goharbor/harbor-jobservice` | -| `jobservice.image.tag` | Tag for jobservice image | `dev` | -| `jobservice.replicas` | The replica count | `1` | -| `jobservice.revisionHistoryLimit` | The revision history limit | `10` | -| `jobservice.maxJobWorkers` | The max job workers | `10` | -| `jobservice.jobLoggers` | The loggers for jobs: `file`, `database` or `stdout` | `[file]` | -| `jobservice.loggerSweeperDuration` | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`) | `14` | -| `jobservice.notification.webhook_job_max_retry` | The maximum retry of webhook sending notifications | `3` | -| `jobservice.notification.webhook_job_http_client_timeout` | The http client timeout value of webhook sending notifications | `3` | -| `jobservice.reaper.max_update_hours` | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 | `24` | -| `jobservice.reaper.max_dangling_hours` | the max time for execution in running state without new task created | `168` | -| `jobservice.resources` | The [resources] to allocate for container | undefined | -| `jobservice.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `jobservice.nodeSelector` | Node labels for pod assignment | `{}` | -| `jobservice.tolerations` | Tolerations for pod assignment | `[]` | -| `jobservice.affinity` | Node/Pod affinities | `{}` | -| `jobservice.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `jobservice.podAnnotations` | Annotations to add to the jobservice pod | `{}` | -| `jobservice.priorityClassName` | The priority class to run the pod as | | -| `jobservice.secret` | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `jobservice.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Registry** | | | -| `registry.registry.image.repository` | Repository for registry image | `goharbor/registry-photon` | -| `registry.registry.image.tag` | Tag for registry image | `dev` | -| `registry.registry.resources` | The [resources] to allocate for container | undefined | -| `registry.controller.image.repository` | Repository for registry controller image | `goharbor/harbor-registryctl` | -| `registry.controller.image.tag` | Tag for registry controller image | `dev` | -| `registry.controller.resources` | The [resources] to allocate for container | undefined | -| `registry.replicas` | The replica count | `1` | -| `registry.revisionHistoryLimit` | The revision history limit | `10` | -| `registry.nodeSelector` | Node labels for pod assignment | `{}` | -| `registry.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `registry.tolerations` | Tolerations for pod assignment | `[]` | -| `registry.affinity` | Node/Pod affinities | `{}` | -| `registry.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `registry.middleware` | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware). | | -| `registry.podAnnotations` | Annotations to add to the registry pod | `{}` | -| `registry.priorityClassName` | The priority class to run the pod as | | -| `registry.secret` | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars. | | -| `registry.credentials.username` | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). | `harbor_registry_user` | -| `registry.credentials.password` | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation. | `harbor_registry_password` | -| `registry.credentials.existingSecret` | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD` | `""` | -| `registry.credentials.htpasswdString` | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. | undefined | -| `registry.relativeurls` | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy | `false` | -| `registry.upload_purging.enabled` | If true, enable purge _upload directories | `true` | -| `registry.upload_purging.age` | Remove files in _upload directories which exist for a period of time, default is one week. | `168h` | -| `registry.upload_purging.interval` | The interval of the purge operations | `24h` | -| `registry.upload_purging.dryrun` | If true, enable dryrun for purging _upload, default false | `false` | -| `registry.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **[Trivy][trivy]** | | | -| `trivy.enabled` | The flag to enable Trivy scanner | `true` | -| `trivy.image.repository` | Repository for Trivy adapter image | `goharbor/trivy-adapter-photon` | -| `trivy.image.tag` | Tag for Trivy adapter image | `dev` | -| `trivy.resources` | The [resources] to allocate for Trivy adapter container | | -| `trivy.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `trivy.replicas` | The number of Pod replicas | `1` | -| `trivy.debugMode` | The flag to enable Trivy debug mode | `false` | -| `trivy.vulnType` | Comma-separated list of vulnerability types. Possible values `os` and `library`. | `os,library` | -| `trivy.severity` | Comma-separated list of severities to be checked | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | -| `trivy.ignoreUnfixed` | The flag to display only fixed vulnerabilities | `false` | -| `trivy.insecure` | The flag to skip verifying registry certificate | `false` | -| `trivy.skipUpdate` | The flag to disable [Trivy DB][trivy-db] downloads from GitHub | `false` | -| `trivy.skipJavaDBUpdate` | If the flag is enabled you have to manually download the `trivy-java.db` file [Trivy Java DB][trivy-java-db] and mount it in the `/home/scanner/.cache/trivy/java-db/trivy-java.db` path | `false` | -| `trivy.offlineScan` | The flag prevents Trivy from sending API requests to identify dependencies. | `false` | -| `trivy.securityCheck` | Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. | `vuln` | -| `trivy.timeout` | The duration to wait for scan completion | `5m0s` | -| `trivy.gitHubToken` | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting]) | | -| `trivy.priorityClassName` | The priority class to run the pod as | | -| `trivy.topologySpreadConstraints` | The priority class to run the pod as | | -| `trivy.initContainers` | Init containers to be run before the controller's container starts. | `[]` | -| **Database** | | | -| `database.type` | If external database is used, set it to `external` | `internal` | -| `database.internal.image.repository` | Repository for database image | `goharbor/harbor-db` | -| `database.internal.image.tag` | Tag for database image | `dev` | -| `database.internal.password` | The password for database | `changeit` | -| `database.internal.shmSizeLimit` | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container | `512Mi` | -| `database.internal.resources` | The [resources] to allocate for container | undefined | -| `database.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `database.internal.initContainer.migrator.resources` | The [resources] to allocate for the database migrator initContainer | undefined | -| `database.internal.initContainer.permissions.resources` | The [resources] to allocate for the database permissions initContainer | undefined | -| `database.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `database.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `database.internal.affinity` | Node/Pod affinities | `{}` | -| `database.internal.priorityClassName` | The priority class to run the pod as | | -| `database.internal.livenessProbe.timeoutSeconds` | The timeout used in liveness probe; 1 to 5 seconds | 1 | -| `database.internal.readinessProbe.timeoutSeconds` | The timeout used in readiness probe; 1 to 5 seconds | 1 | -| `database.internal.extrInitContainers` | Extra init containers to be run before the database's container starts. | `[]` | -| `database.external.host` | The hostname of external database | `192.168.0.1` | -| `database.external.port` | The port of external database | `5432` | -| `database.external.username` | The username of external database | `user` | -| `database.external.password` | The password of external database | `password` | -| `database.external.coreDatabase` | The database used by core service | `registry` | -| `database.external.existingSecret` | An existing password containing the database password. the key must be `password`. | `""` | -| `database.external.sslmode` | Connection method of external database (require, verify-full, verify-ca, disable) | `disable` | -| `database.maxIdleConns` | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained. | `50` | -| `database.maxOpenConns` | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections. | `100` | -| `database.podAnnotations` | Annotations to add to the database pod | `{}` | -| **Redis** | | | -| `redis.type` | If external redis is used, set it to `external` | `internal` | -| `redis.internal.image.repository` | Repository for redis image | `goharbor/redis-photon` | -| `redis.internal.image.tag` | Tag for redis image | `dev` | -| `redis.internal.resources` | The [resources] to allocate for container | undefined | -| `redis.internal.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `redis.internal.nodeSelector` | Node labels for pod assignment | `{}` | -| `redis.internal.tolerations` | Tolerations for pod assignment | `[]` | -| `redis.internal.affinity` | Node/Pod affinities | `{}` | -| `redis.internal.priorityClassName` | The priority class to run the pod as | | -| `redis.internal.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.internal.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.internal.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.internal.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.internal.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.internal.initContainers` | Init containers to be run before the redis's container starts. | `[]` | -| `redis.external.addr` | The addr of external Redis: :. When using sentinel, it should be :,:,: | `192.168.0.2:6379` | -| `redis.external.sentinelMasterSet` | The name of the set of Redis instances to monitor | | -| `redis.external.coreDatabaseIndex` | The database index for core | `0` | -| `redis.external.jobserviceDatabaseIndex` | The database index for jobservice | `1` | -| `redis.external.registryDatabaseIndex` | The database index for registry | `2` | -| `redis.external.trivyAdapterIndex` | The database index for trivy adapter | `5` | -| `redis.external.harborDatabaseIndex` | The database index for harbor miscellaneous business logic | `0` | -| `redis.external.cacheLayerDatabaseIndex` | The database index for harbor cache layer | `0` | -| `redis.external.username` | The username of external Redis | | -| `redis.external.password` | The password of external Redis | | -| `redis.external.existingSecret` | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`. | `""` | -| `redis.podAnnotations` | Annotations to add to the redis pod | `{}` | -| **Exporter** | | | -| `exporter.replicas` | The replica count | `1` | -| `exporter.revisionHistoryLimit` | The revision history limit | `10` | -| `exporter.podAnnotations` | Annotations to add to the exporter pod | `{}` | -| `exporter.image.repository` | Repository for redis image | `goharbor/harbor-exporter` | -| `exporter.image.tag` | Tag for exporter image | `dev` | -| `exporter.nodeSelector` | Node labels for pod assignment | `{}` | -| `exporter.tolerations` | Tolerations for pod assignment | `[]` | -| `exporter.affinity` | Node/Pod affinities | `{}` | -| `exporter.topologySpreadConstraints` | Constraints that define how Pods are spread across failure-domains like regions or availability zones | `[]` | -| `exporter.automountServiceAccountToken` | Mount serviceAccountToken? | `false` | -| `exporter.cacheDuration` | the cache duration for information that exporter collected from Harbor | `30` | -| `exporter.cacheCleanInterval` | cache clean interval for information that exporter collected from Harbor | `14400` | -| `exporter.priorityClassName` | The priority class to run the pod as | | -| **Metrics** | | | -| `metrics.enabled` | if enable harbor metrics | `false` | -| `metrics.core.path` | the url path for core metrics | `/metrics` | -| `metrics.core.port` | the port for core metrics | `8001` | -| `metrics.registry.path` | the url path for registry metrics | `/metrics` | -| `metrics.registry.port` | the port for registry metrics | `8001` | -| `metrics.exporter.path` | the url path for exporter metrics | `/metrics` | -| `metrics.exporter.port` | the port for exporter metrics | `8001` | -| `metrics.serviceMonitor.enabled` | create prometheus serviceMonitor. Requires prometheus CRD's | `false` | -| `metrics.serviceMonitor.additionalLabels` | additional labels to upsert to the manifest | `""` | -| `metrics.serviceMonitor.interval` | scrape period for harbor metrics | `""` | -| `metrics.serviceMonitor.metricRelabelings` | metrics relabel to add/mod/del before ingestion | `[]` | -| `metrics.serviceMonitor.relabelings` | relabels to add/mod/del to sample before scrape | `[]` | -| **Trace** | | | -| `trace.enabled` | Enable tracing or not | `false` | -| `trace.provider` | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+ | `jaeger` | -| `trace.sample_rate` | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth | `1` | -| `trace.namespace` | Namespace used to differentiate different harbor services | | -| `trace.attributes` | `attributes` is a key value dict contains user defined attributes used to initialize trace provider | | -| `trace.jaeger.endpoint` | The endpoint of jaeger | `http://hostname:14268/api/traces` | -| `trace.jaeger.username` | The username of jaeger | | -| `trace.jaeger.password` | The password of jaeger | | -| `trace.jaeger.agent_host` | The agent host of jaeger | | -| `trace.jaeger.agent_port` | The agent port of jaeger | `6831` | -| `trace.otel.endpoint` | The endpoint of otel | `hostname:4318` | -| `trace.otel.url_path` | The URL path of otel | `/v1/traces` | -| `trace.otel.compression` | Whether enable compression or not for otel | `false` | -| `trace.otel.insecure` | Whether establish insecure connection or not for otel | `true` | -| `trace.otel.timeout` | The timeout in seconds of otel | `10` | -| **Cache** | | | -| `cache.enabled` | Enable cache layer or not | `false` | -| `cache.expireHours` | The expire hours of cache layer | `24` | - -[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ -[trivy]: https://github.com/aquasecurity/trivy -[trivy-db]: https://github.com/aquasecurity/trivy-db -[trivy-java-db]: https://github.com/aquasecurity/trivy-java-db -[trivy-rate-limiting]: https://github.com/aquasecurity/trivy#github-rate-limiting diff --git a/charts/harbor/harbor/1.15.1/templates/NOTES.txt b/charts/harbor/harbor/1.15.1/templates/NOTES.txt deleted file mode 100644 index 0980c08a35..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/NOTES.txt +++ /dev/null @@ -1,3 +0,0 @@ -Please wait for several minutes for Harbor deployment to complete. -Then you should be able to visit the Harbor portal at {{ .Values.externalURL }} -For more details, please visit https://github.com/goharbor/harbor diff --git a/charts/harbor/harbor/1.15.1/templates/_helpers.tpl b/charts/harbor/harbor/1.15.1/templates/_helpers.tpl deleted file mode 100644 index f6249b3993..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/_helpers.tpl +++ /dev/null @@ -1,581 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "harbor.name" -}} -{{- default "harbor" .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "harbor.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default "harbor" .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* Helm required labels: legacy */}} -{{- define "harbor.legacy.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helm required labels */}} -{{- define "harbor.labels" -}} -heritage: {{ .Release.Service }} -release: {{ .Release.Name }} -chart: {{ .Chart.Name }} -app: "{{ template "harbor.name" . }}" -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/name: {{ include "harbor.name" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: {{ include "harbor.name" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -{{- end -}} - -{{/* matchLabels */}} -{{- define "harbor.matchLabels" -}} -release: {{ .Release.Name }} -app: "{{ template "harbor.name" . }}" -{{- end -}} - -{{/* Helper for printing values from existing secrets*/}} -{{- define "harbor.secretKeyHelper" -}} - {{- if and (not (empty .data)) (hasKey .data .key) }} - {{- index .data .key | b64dec -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCert" -}} - {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForIngress" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (eq .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.autoGenCertForNginx" -}} - {{- if and (eq (include "harbor.autoGenCert" .) "true") (ne .Values.expose.type "ingress") -}} - {{- printf "true" -}} - {{- else -}} - {{- printf "false" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.host" -}} - {{- if eq .Values.database.type "internal" -}} - {{- template "harbor.database" . }} - {{- else -}} - {{- .Values.database.external.host -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.port" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "5432" -}} - {{- else -}} - {{- .Values.database.external.port -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.username" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "postgres" -}} - {{- else -}} - {{- .Values.database.external.username -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.rawPassword" -}} - {{- if eq .Values.database.type "internal" -}} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.database" .) -}} - {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "POSTGRES_PASSWORD") -}} - {{- .Values.database.internal.password | default (index $existingSecret.data "POSTGRES_PASSWORD" | b64dec) -}} - {{- else -}} - {{- .Values.database.internal.password -}} - {{- end -}} - {{- else -}} - {{- .Values.database.external.password -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.escapedRawPassword" -}} - {{- include "harbor.database.rawPassword" . | urlquery | replace "+" "%20" -}} -{{- end -}} - -{{- define "harbor.database.encryptedPassword" -}} - {{- include "harbor.database.rawPassword" . | b64enc | quote -}} -{{- end -}} - -{{- define "harbor.database.coreDatabase" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "registry" -}} - {{- else -}} - {{- .Values.database.external.coreDatabase -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.database.sslmode" -}} - {{- if eq .Values.database.type "internal" -}} - {{- printf "%s" "disable" -}} - {{- else -}} - {{- .Values.database.external.sslmode -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.redis.scheme" -}} - {{- with .Values.redis }} - {{- ternary "redis+sentinel" "redis" (and (eq .type "external" ) (not (not .external.sentinelMasterSet))) }} - {{- end }} -{{- end -}} - -/*host:port*/ -{{- define "harbor.redis.addr" -}} - {{- with .Values.redis }} - {{- ternary (printf "%s:6379" (include "harbor.redis" $ )) .external.addr (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.masterSet" -}} - {{- with .Values.redis }} - {{- ternary .external.sentinelMasterSet "" (eq "redis+sentinel" (include "harbor.redis.scheme" $)) }} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.password" -}} - {{- with .Values.redis }} - {{- ternary "" .external.password (eq .type "internal") }} - {{- end }} -{{- end -}} - - -{{- define "harbor.redis.pwdfromsecret" -}} - {{- (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD | b64dec }} -{{- end -}} - -{{- define "harbor.redis.cred" -}} - {{- with .Values.redis }} - {{- if (and (eq .type "external" ) (.external.existingSecret)) }} - {{- printf ":%s@" (include "harbor.redis.pwdfromsecret" $) }} - {{- else }} - {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }} - {{- end }} - {{- end }} -{{- end -}} - -/*scheme://[:password@]host:port[/master_set]*/ -{{- define "harbor.redis.url" -}} - {{- with .Values.redis }} - {{- $path := ternary "" (printf "/%s" (include "harbor.redis.masterSet" $)) (not (include "harbor.redis.masterSet" $)) }} - {{- printf "%s://%s%s%s" (include "harbor.redis.scheme" $) (include "harbor.redis.cred" $) (include "harbor.redis.addr" $) $path -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCore" -}} - {{- with .Values.redis }} - {{- $index := ternary "0" .external.coreDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index*/ -{{- define "harbor.redis.urlForJobservice" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.jobserviceDatabaseIndex .external.jobserviceDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForRegistry" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForTrivy" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.trivyAdapterIndex .external.trivyAdapterIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForHarbor" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.harborDatabaseIndex .external.harborDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -/*scheme://[:password@]addr/db_index?idle_timeout_seconds=30*/ -{{- define "harbor.redis.urlForCache" -}} - {{- with .Values.redis }} - {{- $index := ternary .internal.cacheLayerDatabaseIndex .external.cacheLayerDatabaseIndex (eq .type "internal") }} - {{- printf "%s/%s?idle_timeout_seconds=30" (include "harbor.redis.url" $) $index -}} - {{- end }} -{{- end -}} - -{{- define "harbor.redis.dbForRegistry" -}} - {{- with .Values.redis }} - {{- ternary .internal.registryDatabaseIndex .external.registryDatabaseIndex (eq .type "internal") }} - {{- end }} -{{- end -}} - -{{- define "harbor.portal" -}} - {{- printf "%s-portal" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.core" -}} - {{- printf "%s-core" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.redis" -}} - {{- printf "%s-redis" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.jobservice" -}} - {{- printf "%s-jobservice" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registry" -}} - {{- printf "%s-registry" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.registryCtl" -}} - {{- printf "%s-registryctl" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.database" -}} - {{- printf "%s-database" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.trivy" -}} - {{- printf "%s-trivy" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.nginx" -}} - {{- printf "%s-nginx" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.exporter" -}} - {{- printf "%s-exporter" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.ingress" -}} - {{- printf "%s-ingress" (include "harbor.fullname" .) -}} -{{- end -}} - -{{- define "harbor.noProxy" -}} - {{- printf "%s,%s,%s,%s,%s,%s,%s,%s" (include "harbor.core" .) (include "harbor.jobservice" .) (include "harbor.database" .) (include "harbor.registry" .) (include "harbor.portal" .) (include "harbor.trivy" .) (include "harbor.exporter" .) .Values.proxy.noProxy -}} -{{- end -}} - -{{- define "harbor.caBundleVolume" -}} -- name: ca-bundle-certs - secret: - secretName: {{ .Values.caBundleSecretName }} -{{- end -}} - -{{- define "harbor.caBundleVolumeMount" -}} -- name: ca-bundle-certs - mountPath: /harbor_cust_cert/custom-ca.crt - subPath: ca.crt -{{- end -}} - -{{/* scheme for all components because it only support http mode */}} -{{- define "harbor.component.scheme" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "https" -}} - {{- else -}} - {{- printf "http" -}} - {{- end -}} -{{- end -}} - -{{/* core component container port */}} -{{- define "harbor.core.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* core component service port */}} -{{- define "harbor.core.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component container port */}} -{{- define "harbor.jobservice.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* jobservice component service port */}} -{{- define "harbor.jobservice.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* portal component container port */}} -{{- define "harbor.portal.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* portal component service port */}} -{{- define "harbor.portal.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "443" -}} - {{- else -}} - {{- printf "80" -}} - {{- end -}} -{{- end -}} - -{{/* registry component container port */}} -{{- define "harbor.registry.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registry component service port */}} -{{- define "harbor.registry.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "5443" -}} - {{- else -}} - {{- printf "5000" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component container port */}} -{{- define "harbor.registryctl.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* registryctl component service port */}} -{{- define "harbor.registryctl.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component container port */}} -{{- define "harbor.trivy.containerPort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* trivy component service port */}} -{{- define "harbor.trivy.servicePort" -}} - {{- if .Values.internalTLS.enabled -}} - {{- printf "8443" -}} - {{- else -}} - {{- printf "8080" -}} - {{- end -}} -{{- end -}} - -{{/* CORE_URL */}} -{{/* port is included in this url as a workaround for issue https://github.com/aquasecurity/harbor-scanner-trivy/issues/108 */}} -{{- define "harbor.coreURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.core" .) (include "harbor.core.servicePort" .) -}} -{{- end -}} - -{{/* JOBSERVICE_URL */}} -{{- define "harbor.jobserviceURL" -}} - {{- printf "%s://%s-jobservice" (include "harbor.component.scheme" .) (include "harbor.fullname" .) -}} -{{- end -}} - -{{/* PORTAL_URL */}} -{{- define "harbor.portalURL" -}} - {{- printf "%s://%s" (include "harbor.component.scheme" .) (include "harbor.portal" .) -}} -{{- end -}} - -{{/* REGISTRY_URL */}} -{{- define "harbor.registryURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registry.servicePort" .) -}} -{{- end -}} - -{{/* REGISTRY_CONTROLLER_URL */}} -{{- define "harbor.registryControllerURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.registry" .) (include "harbor.registryctl.servicePort" .) -}} -{{- end -}} - -{{/* TOKEN_SERVICE_URL */}} -{{- define "harbor.tokenServiceURL" -}} - {{- printf "%s/service/token" (include "harbor.coreURL" .) -}} -{{- end -}} - -{{/* TRIVY_ADAPTER_URL */}} -{{- define "harbor.trivyAdapterURL" -}} - {{- printf "%s://%s:%s" (include "harbor.component.scheme" .) (include "harbor.trivy" .) (include "harbor.trivy.servicePort" .) -}} -{{- end -}} - -{{- define "harbor.internalTLS.core.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.core.secretName -}} - {{- else -}} - {{- printf "%s-core-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.jobservice.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.jobservice.secretName -}} - {{- else -}} - {{- printf "%s-jobservice-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.portal.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.portal.secretName -}} - {{- else -}} - {{- printf "%s-portal-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.registry.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.registry.secretName -}} - {{- else -}} - {{- printf "%s-registry-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.internalTLS.trivy.secretName" -}} - {{- if eq .Values.internalTLS.certSource "secret" -}} - {{- .Values.internalTLS.trivy.secretName -}} - {{- else -}} - {{- printf "%s-trivy-internal-tls" (include "harbor.fullname" .) -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsCoreSecretForIngress" -}} - {{- if eq .Values.expose.tls.certSource "none" -}} - {{- printf "" -}} - {{- else if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.ingress" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.tlsSecretForNginx" -}} - {{- if eq .Values.expose.tls.certSource "secret" -}} - {{- .Values.expose.tls.secret.secretName -}} - {{- else -}} - {{- include "harbor.nginx" . -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.metricsPortName" -}} - {{- if .Values.internalTLS.enabled }} - {{- printf "https-metrics" -}} - {{- else -}} - {{- printf "http-metrics" -}} - {{- end -}} -{{- end -}} - -{{- define "harbor.traceEnvs" -}} - TRACE_ENABLED: "{{ .Values.trace.enabled }}" - TRACE_SAMPLE_RATE: "{{ .Values.trace.sample_rate }}" - TRACE_NAMESPACE: "{{ .Values.trace.namespace }}" - {{- if .Values.trace.attributes }} - TRACE_ATTRIBUTES: {{ .Values.trace.attributes | toJson | squote }} - {{- end }} - {{- if eq .Values.trace.provider "jaeger" }} - TRACE_JAEGER_ENDPOINT: "{{ .Values.trace.jaeger.endpoint }}" - TRACE_JAEGER_USERNAME: "{{ .Values.trace.jaeger.username }}" - TRACE_JAEGER_AGENT_HOSTNAME: "{{ .Values.trace.jaeger.agent_host }}" - TRACE_JAEGER_AGENT_PORT: "{{ .Values.trace.jaeger.agent_port }}" - {{- else }} - TRACE_OTEL_ENDPOINT: "{{ .Values.trace.otel.endpoint }}" - TRACE_OTEL_URL_PATH: "{{ .Values.trace.otel.url_path }}" - TRACE_OTEL_COMPRESSION: "{{ .Values.trace.otel.compression }}" - TRACE_OTEL_INSECURE: "{{ .Values.trace.otel.insecure }}" - TRACE_OTEL_TIMEOUT: "{{ .Values.trace.otel.timeout }}" - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForCore" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-core" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForJobservice" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-jobservice" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceEnvsForRegistryCtl" -}} - {{- if .Values.trace.enabled }} - TRACE_SERVICE_NAME: "harbor-registryctl" - {{ include "harbor.traceEnvs" . }} - {{- end }} -{{- end -}} - -{{- define "harbor.traceJaegerPassword" -}} - {{- if and .Values.trace.enabled (eq .Values.trace.provider "jaeger") }} - TRACE_JAEGER_PASSWORD: "{{ .Values.trace.jaeger.password | default "" | b64enc }}" - {{- end }} -{{- end -}} - -{{/* Allow KubeVersion to be overridden. */}} -{{- define "harbor.ingress.kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}} -{{- end -}} diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-cm.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-cm.yaml deleted file mode 100644 index 93cab01b4c..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-cm.yaml +++ /dev/null @@ -1,90 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - app.conf: |+ - appname = Harbor - runmode = prod - enablegzip = true - - [prod] - httpport = {{ ternary "8443" "8080" .Values.internalTLS.enabled }} - PORT: "{{ ternary "8443" "8080" .Values.internalTLS.enabled }}" - DATABASE_TYPE: "postgresql" - POSTGRESQL_HOST: "{{ template "harbor.database.host" . }}" - POSTGRESQL_PORT: "{{ template "harbor.database.port" . }}" - POSTGRESQL_USERNAME: "{{ template "harbor.database.username" . }}" - POSTGRESQL_DATABASE: "{{ template "harbor.database.coreDatabase" . }}" - POSTGRESQL_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - POSTGRESQL_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - POSTGRESQL_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" - EXT_ENDPOINT: "{{ .Values.externalURL }}" - CORE_URL: "{{ template "harbor.coreURL" . }}" - JOBSERVICE_URL: "{{ template "harbor.jobserviceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - CORE_LOCAL_URL: "{{ ternary "https://127.0.0.1:8443" "http://127.0.0.1:8080" .Values.internalTLS.enabled }}" - WITH_TRIVY: {{ .Values.trivy.enabled | quote }} - TRIVY_ADAPTER_URL: "{{ template "harbor.trivyAdapterURL" . }}" - REGISTRY_STORAGE_PROVIDER_NAME: "{{ .Values.persistence.imageChartStorage.type }}" - LOG_LEVEL: "{{ .Values.logLevel }}" - CONFIG_PATH: "/etc/core/app.conf" - CHART_CACHE_DRIVER: "redis" - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - _REDIS_URL_REG: "{{ template "harbor.redis.urlForRegistry" . }}" - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.harborDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.harborDatabaseIndex) }} - _REDIS_URL_HARBOR: "{{ template "harbor.redis.urlForHarbor" . }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} - PORTAL_URL: "{{ template "harbor.portalURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - {{- if .Values.uaaSecretName }} - UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt" - {{- end }} - {{- if has "core" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE: "docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr,jfrog-artifactory" - {{- if .Values.metrics.enabled}} - METRIC_ENABLE: "true" - METRIC_PATH: "{{ .Values.metrics.core.path }}" - METRIC_PORT: "{{ .Values.metrics.core.port }}" - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: core - {{- end }} - - {{- if hasKey .Values.core "gcTimeWindowHours" }} - #make the GC time window configurable for testing - GC_TIME_WINDOW_HOURS: "{{ .Values.core.gcTimeWindowHours }}" - {{- end }} - {{- template "harbor.traceEnvsForCore" . }} - - {{- if .Values.core.artifactPullAsyncFlushDuration }} - ARTIFACT_PULL_ASYNC_FLUSH_DURATION: {{ .Values.core.artifactPullAsyncFlushDuration | quote }} - {{- end }} - - {{- if .Values.core.gdpr}} - {{- if .Values.core.gdpr.deleteUser}} - GDPR_DELETE_USER: "true" - {{- end }} - {{- if .Values.core.gdpr.auditLogsCompliant}} - GDPR_AUDIT_LOGS: "true" - {{- end }} - {{- end }} - - {{- if .Values.cache.enabled }} - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - - {{- if .Values.core.quotaUpdateProvider }} - QUOTA_UPDATE_PROVIDER: "{{ .Values.core.quotaUpdateProvider }}" - {{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-dpl.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-dpl.yaml deleted file mode 100644 index 2ee8fd59c2..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-dpl.yaml +++ /dev/null @@ -1,257 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: core - app.kubernetes.io/component: core -spec: - replicas: {{ .Values.core.replicas }} - revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: core - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: core - app.kubernetes.io/component: core -{{- if .Values.core.podLabels }} -{{ toYaml .Values.core.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/core/core-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.core.podAnnotations }} -{{ toYaml .Values.core.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.core.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.core.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: core -{{- end }} -{{- end }} - {{- with .Values.core.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: core - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.core.startupProbe.enabled }} - startupProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 360 - initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }} - periodSeconds: 10 - {{- end }} - livenessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v2.0/ping - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.core.containerPort" . }} - failureThreshold: 2 - periodSeconds: 10 - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/core/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/core/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/core/ca.crt - {{- end }} - {{- if .Values.database.external.existingSecret }} - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} - {{- if .Values.core.existingXsrfSecret }} - - name: CSRF_KEY - valueFrom: - secretKeyRef: - name: {{ .Values.core.existingXsrfSecret }} - key: {{ .Values.core.existingXsrfSecretKey }} - {{- end }} -{{- with .Values.core.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: {{ template "harbor.core.containerPort" . }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - - name: secret-key - mountPath: /etc/core/key - subPath: key - - name: token-service-private-key - mountPath: /etc/core/private_key.pem - subPath: tls.key - {{- if .Values.expose.tls.enabled }} - - name: ca-download - mountPath: /etc/core/ca - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - mountPath: /etc/core/auth-ca/auth-ca.crt - subPath: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - {{- end }} - - name: psc - mountPath: /etc/core/token - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} -{{- if .Values.core.resources }} - resources: -{{ toYaml .Values.core.resources | indent 10 }} -{{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - - name: secret-key - secret: - {{- if .Values.existingSecretSecretKey }} - secretName: {{ .Values.existingSecretSecretKey }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - items: - - key: secretKey - path: key - - name: token-service-private-key - secret: - {{- if .Values.core.secretName }} - secretName: {{ .Values.core.secretName }} - {{- else }} - secretName: {{ template "harbor.core" . }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: ca-download - secret: - {{- if .Values.caSecretName }} - secretName: {{ .Values.caSecretName }} - {{- else if eq (include "harbor.autoGenCertForIngress" .) "true" }} - secretName: "{{ template "harbor.ingress" . }}" - {{- else if eq (include "harbor.autoGenCertForNginx" .) "true" }} - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- end }} - {{- if .Values.uaaSecretName }} - - name: auth-ca-cert - secret: - secretName: {{ .Values.uaaSecretName }} - items: - - key: ca.crt - path: auth-ca.crt - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - - name: psc - emptyDir: {} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.core.priorityClassName }} - priorityClassName: {{ .Values.core.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-pre-upgrade-job.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-pre-upgrade-job.yaml deleted file mode 100644 index ce0b13134d..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-pre-upgrade-job.yaml +++ /dev/null @@ -1,77 +0,0 @@ -{{- if .Values.enableMigrateHelmHook }} -apiVersion: batch/v1 -kind: Job -metadata: - name: migration-job - labels: -{{ include "harbor.labels" . | indent 4 }} - component: migrator - annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "-5" -spec: - template: - metadata: - labels: -{{ include "harbor.matchLabels" . | indent 8 }} - component: migrator - spec: - restartPolicy: Never - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.core.serviceAccountName }} - serviceAccountName: {{ .Values.core.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - containers: - - name: core-job - image: {{ .Values.core.image.repository }}:{{ .Values.core.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: ["/harbor/harbor_core", "-mode=migrate"] - envFrom: - - configMapRef: - name: "{{ template "harbor.core" . }}" - - secretRef: - name: "{{ template "harbor.core" . }}" - {{- if .Values.database.external.existingSecret }} - env: - - name: POSTGRESQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/core/app.conf - subPath: app.conf - volumes: - - name: config - configMap: - name: {{ template "harbor.core" . }} - items: - - key: app.conf - path: app.conf - {{- with .Values.core.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.core.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-secret.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-secret.yaml deleted file mode 100644 index 62a41fce80..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-secret.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.core" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.existingSecretSecretKey }} - secretKey: {{ .Values.secretKey | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingSecret }} - secret: {{ .Values.core.secret | default (include "harbor.secretKeyHelper" (dict "key" "secret" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.core.secretName }} - {{- $ca := genCA "harbor-token-ca" 365 }} - tls.key: {{ .Values.core.tokenKey | default $ca.Key | b64enc | quote }} - tls.crt: {{ .Values.core.tokenCert | default $ca.Cert | b64enc | quote }} - {{- end }} - {{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} - {{- end }} - {{- if not .Values.database.external.existingSecret }} - POSTGRESQL_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- if not .Values.core.existingXsrfSecret }} - CSRF_KEY: {{ .Values.core.xsrfKey | default (include "harbor.secretKeyHelper" (dict "key" "CSRF_KEY" "data" $existingSecret.data)) | default (randAlphaNum 32) | b64enc | quote }} - {{- end }} -{{- if .Values.core.configureUserSettings }} - CONFIG_OVERWRITE_JSON: {{ .Values.core.configureUserSettings | b64enc | quote }} -{{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-svc.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-svc.yaml deleted file mode 100644 index 0d2cfb2915..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.core" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.core.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - name: {{ ternary "https-web" "http-web" .Values.internalTLS.enabled }} - port: {{ template "harbor.core.servicePort" . }} - targetPort: {{ template "harbor.core.containerPort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.core.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: core diff --git a/charts/harbor/harbor/1.15.1/templates/core/core-tls.yaml b/charts/harbor/harbor/1.15.1/templates/core/core-tls.yaml deleted file mode 100644 index c52148f0d9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/core/core-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.core.crt\" is required!" .Values.internalTLS.core.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.core.key\" is required!" .Values.internalTLS.core.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/database/database-secret.yaml b/charts/harbor/harbor/1.15.1/templates/database/database-secret.yaml deleted file mode 100644 index 864aff4a18..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/database/database-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - POSTGRES_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end -}} diff --git a/charts/harbor/harbor/1.15.1/templates/database/database-ss.yaml b/charts/harbor/harbor/1.15.1/templates/database/database-ss.yaml deleted file mode 100644 index 71c5eb1e08..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/database/database-ss.yaml +++ /dev/null @@ -1,162 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -{{- $database := .Values.persistence.persistentVolumeClaim.database -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: database - app.kubernetes.io/component: database -spec: - replicas: 1 - serviceName: "{{ template "harbor.database" . }}" - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: database - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: database - app.kubernetes.io/component: database -{{- if .Values.database.podLabels }} -{{ toYaml .Values.database.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/database/database-secret.yaml") . | sha256sum }} -{{- if .Values.database.podAnnotations }} -{{ toYaml .Values.database.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.database.internal.serviceAccountName }} - serviceAccountName: {{ .Values.database.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.database.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - initContainers: - # with "fsGroup" set, each time a volume is mounted, Kubernetes must recursively chown() and chmod() all the files and directories inside the volume - # this causes the postgresql reports the "data directory /var/lib/postgresql/data/pgdata has group or world access" issue when using some CSIs e.g. Ceph - # use this init container to correct the permission - # as "fsGroup" applied before the init container running, the container has enough permission to execute the command - - name: "data-permissions-ensurer" - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - command: ["/bin/sh"] - args: ["-c", "chmod -R 700 /var/lib/postgresql/data/pgdata || true"] -{{- if .Values.database.internal.initContainer.permissions.resources }} - resources: -{{ toYaml .Values.database.internal.initContainer.permissions.resources | indent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - {{- with .Values.database.internal.extrInitContainers }} - {{- toYaml . | nindent 6 }} - {{- end }} - containers: - - name: database - image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 300 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }} - readinessProbe: - exec: - command: - - /docker-healthcheck.sh - initialDelaySeconds: 1 - periodSeconds: 10 - timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }} -{{- if .Values.database.internal.resources }} - resources: -{{ toYaml .Values.database.internal.resources | indent 10 }} -{{- end }} - envFrom: - - secretRef: - name: "{{ template "harbor.database" . }}" - env: - # put the data into a sub directory to avoid the permission issue in k8s with restricted psp enabled - # more detail refer to https://github.com/goharbor/harbor-helm/issues/756 - - name: PGDATA - value: "/var/lib/postgresql/data/pgdata" -{{- with .Values.database.internal.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: database-data - mountPath: /var/lib/postgresql/data - subPath: {{ $database.subPath }} - - name: shm-volume - mountPath: /dev/shm - volumes: - - name: shm-volume - emptyDir: - medium: Memory - sizeLimit: {{ .Values.database.internal.shmSizeLimit }} - {{- if not .Values.persistence.enabled }} - - name: "database-data" - emptyDir: {} - {{- else if $database.existingClaim }} - - name: "database-data" - persistentVolumeClaim: - claimName: {{ $database.existingClaim }} - {{- end -}} - {{- with .Values.database.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.database.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.database.internal.priorityClassName }} - priorityClassName: {{ .Values.database.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $database.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: "database-data" - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $database.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $database.accessMode | quote }}] - {{- if $database.storageClass }} - {{- if (eq "-" $database.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $database.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $database.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.15.1/templates/database/database-svc.yaml b/charts/harbor/harbor/1.15.1/templates/database/database-svc.yaml deleted file mode 100644 index 6475048cd9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/database/database-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.database.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.database" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 5432 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: database -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-cm-env.yaml b/charts/harbor/harbor/1.15.1/templates/exporter/exporter-cm-env.yaml deleted file mode 100644 index 0bf4e7d905..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-cm-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.exporter" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - LOG_LEVEL: "{{ .Values.logLevel }}" - HARBOR_EXPORTER_PORT: "{{ .Values.metrics.exporter.port }}" - HARBOR_EXPORTER_METRICS_PATH: "{{ .Values.metrics.exporter.path }}" - HARBOR_EXPORTER_METRICS_ENABLED: "{{ .Values.metrics.enabled }}" - HARBOR_EXPORTER_CACHE_TIME: "{{ .Values.exporter.cacheDuration }}" - HARBOR_EXPORTER_CACHE_CLEAN_INTERVAL: "{{ .Values.exporter.cacheCleanInterval }}" - HARBOR_METRIC_NAMESPACE: harbor - HARBOR_METRIC_SUBSYSTEM: exporter - HARBOR_REDIS_URL: "{{ template "harbor.redis.urlForJobservice" . }}" - HARBOR_REDIS_NAMESPACE: harbor_job_service_namespace - HARBOR_REDIS_TIMEOUT: "3600" - HARBOR_SERVICE_SCHEME: "{{ template "harbor.component.scheme" . }}" - HARBOR_SERVICE_HOST: "{{ template "harbor.core" . }}" - HARBOR_SERVICE_PORT: "{{ template "harbor.core.servicePort" . }}" - HARBOR_DATABASE_HOST: "{{ template "harbor.database.host" . }}" - HARBOR_DATABASE_PORT: "{{ template "harbor.database.port" . }}" - HARBOR_DATABASE_USERNAME: "{{ template "harbor.database.username" . }}" - HARBOR_DATABASE_DBNAME: "{{ template "harbor.database.coreDatabase" . }}" - HARBOR_DATABASE_SSLMODE: "{{ template "harbor.database.sslmode" . }}" - HARBOR_DATABASE_MAX_IDLE_CONNS: "{{ .Values.database.maxIdleConns }}" - HARBOR_DATABASE_MAX_OPEN_CONNS: "{{ .Values.database.maxOpenConns }}" -{{- end}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-dpl.yaml b/charts/harbor/harbor/1.15.1/templates/exporter/exporter-dpl.yaml deleted file mode 100644 index 01e9258ea9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-dpl.yaml +++ /dev/null @@ -1,146 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: exporter - app.kubernetes.io/component: exporter -spec: - replicas: {{ .Values.exporter.replicas }} - revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: exporter - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: exporter - app.kubernetes.io/component: exporter -{{- if .Values.exporter.podLabels }} -{{ toYaml .Values.exporter.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/exporter/exporter-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/exporter/exporter-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/core/core-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.exporter.podAnnotations }} -{{ toYaml .Values.exporter.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.exporter.serviceAccountName }} - serviceAccountName: {{ .Values.exporter.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.exporter.automountServiceAccountToken | default false }} -{{- with .Values.exporter.topologySpreadConstraints }} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: exporter -{{- end }} -{{- end }} - containers: - - name: exporter - image: {{ .Values.exporter.image.repository }}:{{ .Values.exporter.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: {{ .Values.metrics.exporter.port }} - initialDelaySeconds: 30 - periodSeconds: 10 - args: ["-log-level", "{{ .Values.logLevel }}"] - envFrom: - - configMapRef: - name: "{{ template "harbor.exporter" . }}-env" - - secretRef: - name: "{{ template "harbor.exporter" . }}" - env: - {{- if .Values.database.external.existingSecret }} - - name: HARBOR_DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.database.external.existingSecret }} - key: password - {{- end }} - {{- if .Values.existingSecretAdminPassword }} - - name: HARBOR_ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.existingSecretAdminPassword }} - key: {{ .Values.existingSecretAdminPasswordKey }} - {{- end }} -{{- if .Values.exporter.resources }} - resources: -{{ toYaml .Values.exporter.resources | indent 10 }} -{{- end }} -{{- with .Values.exporter.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: {{ .Values.metrics.exporter.port }} - volumeMounts: - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - mountPath: /etc/harbor/ssl/core - # There are some metric data are collectd from harbor core. - # When internal TLS is enabled, the Exporter need the CA file to collect these data. - {{- end }} - volumes: - - name: config - secret: - secretName: "{{ template "harbor.exporter" . }}" - {{- if .Values.internalTLS.enabled }} - - name: core-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.core.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.exporter.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.exporter.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.exporter.priorityClassName }} - priorityClassName: {{ .Values.exporter.priorityClassName }} - {{- end }} -{{ end }} diff --git a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-secret.yaml b/charts/harbor/harbor/1.15.1/templates/exporter/exporter-secret.yaml deleted file mode 100644 index 434a1bf689..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.exporter" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: -{{- if not .Values.existingSecretAdminPassword }} - HARBOR_ADMIN_PASSWORD: {{ .Values.harborAdminPassword | b64enc | quote }} -{{- end }} -{{- if not .Values.database.external.existingSecret }} - HARBOR_DATABASE_PASSWORD: {{ template "harbor.database.encryptedPassword" . }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-svc.yaml b/charts/harbor/harbor/1.15.1/templates/exporter/exporter-svc.yaml deleted file mode 100644 index 4a6f3fdec6..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/exporter/exporter-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.metrics.enabled}} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.exporter" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.exporter.port }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: exporter -{{ end }} diff --git a/charts/harbor/harbor/1.15.1/templates/ingress/ingress.yaml b/charts/harbor/harbor/1.15.1/templates/ingress/ingress.yaml deleted file mode 100644 index 73472c6056..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/ingress/ingress.yaml +++ /dev/null @@ -1,142 +0,0 @@ -{{- if eq .Values.expose.type "ingress" }} -{{- $ingress := .Values.expose.ingress -}} -{{- $tls := .Values.expose.tls -}} -{{- if eq .Values.expose.ingress.controller "gce" }} - {{- $_ := set . "portal_path" "/*" -}} - {{- $_ := set . "api_path" "/api/*" -}} - {{- $_ := set . "service_path" "/service/*" -}} - {{- $_ := set . "v2_path" "/v2/*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} - {{- $_ := set . "controller_path" "/c/*" -}} -{{- else if eq .Values.expose.ingress.controller "ncp" }} - {{- $_ := set . "portal_path" "/.*" -}} - {{- $_ := set . "api_path" "/api/.*" -}} - {{- $_ := set . "service_path" "/service/.*" -}} - {{- $_ := set . "v2_path" "/v2/.*" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} - {{- $_ := set . "controller_path" "/c/.*" -}} -{{- else }} - {{- $_ := set . "portal_path" "/" -}} - {{- $_ := set . "api_path" "/api/" -}} - {{- $_ := set . "service_path" "/service/" -}} - {{- $_ := set . "v2_path" "/v2/" -}} - {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} - {{- $_ := set . "controller_path" "/c/" -}} -{{- end }} - ---- -{{- if semverCompare "<1.14-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} -apiVersion: networking.k8s.io/v1beta1 -{{- else }} -apiVersion: networking.k8s.io/v1 -{{- end }} -kind: Ingress -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if $ingress.labels }} -{{ toYaml $ingress.labels | indent 4 }} -{{- end }} - annotations: -{{ toYaml $ingress.annotations | indent 4 }} -{{- if .Values.internalTLS.enabled }} - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" -{{- end }} -{{- if eq .Values.expose.ingress.controller "ncp" }} - ncp/use-regex: "true" - {{- if $tls.enabled }} - ncp/http-redirect: "true" - {{- end }} -{{- end }} -spec: - {{- if $ingress.className }} - ingressClassName: {{ $ingress.className }} - {{- end }} - {{- if $tls.enabled }} - tls: - - secretName: {{ template "harbor.tlsCoreSecretForIngress" . }} - {{- if $ingress.hosts.core }} - hosts: - - {{ $ingress.hosts.core }} - {{- end }} - {{- end }} - rules: - - http: - paths: -{{- if semverCompare "<1.19-0" (include "harbor.ingress.kubeVersion" .) }} - - path: {{ .api_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - backend: - serviceName: {{ template "harbor.core" . }} - servicePort: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - backend: - serviceName: {{ template "harbor.portal" . }} - servicePort: {{ template "harbor.portal.servicePort" . }} -{{- else }} - - path: {{ .api_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .service_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .v2_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .chartrepo_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .controller_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.core" . }} - port: - number: {{ template "harbor.core.servicePort" . }} - - path: {{ .portal_path }} - pathType: Prefix - backend: - service: - name: {{ template "harbor.portal" . }} - port: - number: {{ template "harbor.portal.servicePort" . }} -{{- end }} - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/ingress/secret.yaml b/charts/harbor/harbor/1.15.1/templates/ingress/secret.yaml deleted file mode 100644 index 41507b3dd9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/ingress/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForIngress" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cert := genSignedCert .Values.expose.ingress.hosts.core nil (list .Values.expose.ingress.hosts.core) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.ingress" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/internal/auto-tls.yaml b/charts/harbor/harbor/1.15.1/templates/internal/auto-tls.yaml deleted file mode 100644 index da5f5e2c7b..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/internal/auto-tls.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} -{{- $ca := genCA "harbor-internal-ca" 365 }} -{{- $coreCN := (include "harbor.core" .) }} -{{- $coreCrt := genSignedCert $coreCN (list "127.0.0.1") (list "localhost" $coreCN) 365 $ca }} -{{- $jsCN := (include "harbor.jobservice" .) }} -{{- $jsCrt := genSignedCert $jsCN nil (list $jsCN) 365 $ca }} -{{- $regCN := (include "harbor.registry" .) }} -{{- $regCrt := genSignedCert $regCN nil (list $regCN) 365 $ca }} -{{- $portalCN := (include "harbor.portal" .) }} -{{- $portalCrt := genSignedCert $portalCN nil (list $portalCN) 365 $ca }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.core.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $coreCrt.Cert | b64enc | quote }} - tls.key: {{ $coreCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $jsCrt.Cert | b64enc | quote }} - tls.key: {{ $jsCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $regCrt.Cert | b64enc | quote }} - tls.key: {{ $regCrt.Key | b64enc | quote }} - ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $portalCrt.Cert | b64enc | quote }} - tls.key: {{ $portalCrt.Key | b64enc | quote }} - -{{- if and .Values.trivy.enabled}} ---- -{{- $trivyCN := (include "harbor.trivy" .) }} -{{- $trivyCrt := genSignedCert $trivyCN nil (list $trivyCN) 365 $ca }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ $ca.Cert | b64enc | quote }} - tls.crt: {{ $trivyCrt.Cert | b64enc | quote }} - tls.key: {{ $trivyCrt.Key | b64enc | quote }} -{{- end }} - -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm-env.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm-env.yaml deleted file mode 100644 index 8411c7a47c..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}-env" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - CORE_URL: "{{ template "harbor.coreURL" . }}" - TOKEN_SERVICE_URL: "{{ template "harbor.tokenServiceURL" . }}" - REGISTRY_URL: "{{ template "harbor.registryURL" . }}" - REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}" - REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}" - - JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}" - JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}" - - {{- if has "jobservice" .Values.proxy.components }} - HTTP_PROXY: "{{ .Values.proxy.httpProxy }}" - HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}" - NO_PROXY: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.metrics.enabled}} - METRIC_NAMESPACE: harbor - METRIC_SUBSYSTEM: jobservice - {{- end }} - {{- template "harbor.traceEnvsForJobservice" . }} - {{- if .Values.cache.enabled }} - _REDIS_URL_CORE: "{{ template "harbor.redis.urlForCore" . }}" - CACHE_ENABLED: "true" - CACHE_EXPIRE_HOURS: "{{ .Values.cache.expireHours }}" - {{- end }} - {{- if or (and (eq .Values.redis.type "internal") .Values.redis.internal.cacheLayerDatabaseIndex) (and (eq .Values.redis.type "external") .Values.redis.external.cacheLayerDatabaseIndex) }} - _REDIS_URL_CACHE_LAYER: "{{ template "harbor.redis.urlForCache" . }}" - {{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm.yaml deleted file mode 100644 index 8211c62209..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-cm.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - #Server listening port - protocol: "{{ template "harbor.component.scheme" . }}" - port: {{ template "harbor.jobservice.containerPort". }} - {{- if .Values.internalTLS.enabled }} - https_config: - cert: "/etc/harbor/ssl/jobservice/tls.crt" - key: "/etc/harbor/ssl/jobservice/tls.key" - {{- end }} - worker_pool: - workers: {{ .Values.jobservice.maxJobWorkers }} - backend: "redis" - redis_pool: - redis_url: "{{ template "harbor.redis.urlForJobservice" . }}" - namespace: "harbor_job_service_namespace" - idle_timeout_second: 3600 - job_loggers: - {{- if has "file" .Values.jobservice.jobLoggers }} - - name: "FILE" - level: {{ .Values.logLevel | upper }} - settings: # Customized settings of logger - base_dir: "/var/log/jobs" - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - settings: # Customized settings of sweeper - work_dir: "/var/log/jobs" - {{- end }} - {{- if has "database" .Values.jobservice.jobLoggers }} - - name: "DB" - level: {{ .Values.logLevel | upper }} - sweeper: - duration: {{ .Values.jobservice.loggerSweeperDuration }} #days - {{- end }} - {{- if has "stdout" .Values.jobservice.jobLoggers }} - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - {{- end }} - metric: - enabled: {{ .Values.metrics.enabled }} - path: {{ .Values.metrics.jobservice.path }} - port: {{ .Values.metrics.jobservice.port }} - #Loggers for the job service - loggers: - - name: "STD_OUTPUT" - level: {{ .Values.logLevel | upper }} - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: {{ .Values.jobservice.reaper.max_update_hours }} - # the max time for execution in running state without new task created - max_dangling_hours: {{ .Values.jobservice.reaper.max_dangling_hours }} diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-dpl.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-dpl.yaml deleted file mode 100644 index 1bb6690824..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-dpl.yaml +++ /dev/null @@ -1,182 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice - app.kubernetes.io/component: jobservice -spec: - replicas: {{ .Values.jobservice.replicas }} - revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: jobservice - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: jobservice - app.kubernetes.io/component: jobservice -{{- if .Values.jobservice.podLabels }} -{{ toYaml .Values.jobservice.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm.yaml") . | sha256sum }} - checksum/configmap-env: {{ include (print $.Template.BasePath "/jobservice/jobservice-cm-env.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/jobservice/jobservice-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.jobservice.podAnnotations }} -{{ toYaml .Values.jobservice.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 -{{- if .Values.jobservice.serviceAccountName }} - serviceAccountName: {{ .Values.jobservice.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.jobservice.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.jobservice.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: jobservice -{{- end }} -{{- end }} - {{- with .Values.jobservice.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: jobservice - image: {{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/v1/stats - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.jobservice.containerPort" . }} - initialDelaySeconds: 20 - periodSeconds: 10 -{{- if .Values.jobservice.resources }} - resources: -{{ toYaml .Values.jobservice.resources | indent 10 }} -{{- end }} - env: - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - {{- if .Values.jobservice.existingSecret }} - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/jobservice/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/jobservice/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/jobservice/ca.crt - {{- end }} - {{- if .Values.registry.credentials.existingSecret }} - - name: REGISTRY_CREDENTIAL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.registry.credentials.existingSecret }} - key: REGISTRY_PASSWD - {{- end }} -{{- with .Values.jobservice.extraEnvVars }} -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.jobservice" . }}-env" - - secretRef: - name: "{{ template "harbor.jobservice" . }}" - ports: - - containerPort: {{ template "harbor.jobservice.containerPort" . }} - volumeMounts: - - name: jobservice-config - mountPath: /etc/jobservice/config.yml - subPath: config.yml - - name: job-logs - mountPath: /var/log/jobs - subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - mountPath: /etc/harbor/ssl/jobservice - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: jobservice-config - configMap: - name: "{{ template "harbor.jobservice" . }}" - - name: job-logs - {{- if and .Values.persistence.enabled (has "file" .Values.jobservice.jobLoggers) }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim | default (include "harbor.jobservice" .) }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: jobservice-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.jobservice.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.jobservice.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.jobservice.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.jobservice.priorityClassName }} - priorityClassName: {{ .Values.jobservice.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-pvc.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-pvc.yaml deleted file mode 100644 index 3f7d00b671..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-pvc.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- $jobLog := .Values.persistence.persistentVolumeClaim.jobservice.jobLog -}} -{{- if and .Values.persistence.enabled (not $jobLog.existingClaim) (has "file" .Values.jobservice.jobLoggers) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.jobservice" . }} - annotations: - {{- range $key, $value := $jobLog.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: jobservice - app.kubernetes.io/component: jobservice -spec: - accessModes: - - {{ $jobLog.accessMode }} - resources: - requests: - storage: {{ $jobLog.size }} - {{- if $jobLog.storageClass }} - {{- if eq "-" $jobLog.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $jobLog.storageClass }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-secrets.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-secrets.yaml deleted file mode 100644 index eeb00bde00..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.jobservice" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.jobservice.existingSecret }} - JOBSERVICE_SECRET: {{ .Values.jobservice.secret | default (include "harbor.secretKeyHelper" (dict "key" "JOBSERVICE_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.registry.credentials.existingSecret }} - REGISTRY_CREDENTIAL_PASSWORD: {{ .Values.registry.credentials.password | b64enc | quote }} - {{- end }} - {{- template "harbor.traceJaegerPassword" . }} diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-svc.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-svc.yaml deleted file mode 100644 index d2b7a47fd4..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-svc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.jobservice" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-jobservice" "http-jobservice" .Values.internalTLS.enabled }} - port: {{ template "harbor.jobservice.servicePort" . }} - targetPort: {{ template "harbor.jobservice.containerPort" . }} -{{- if .Values.metrics.enabled }} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.jobservice.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: jobservice diff --git a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-tls.yaml b/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-tls.yaml deleted file mode 100644 index 234cb39995..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/jobservice/jobservice-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.jobservice.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.jobservice.crt\" is required!" .Values.internalTLS.jobservice.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.jobservice.key\" is required!" .Values.internalTLS.jobservice.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/metrics/metrics-svcmon.yaml b/charts/harbor/harbor/1.15.1/templates/metrics/metrics-svcmon.yaml deleted file mode 100644 index 1122ef01ef..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/metrics/metrics-svcmon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "harbor.fullname" . }} - labels: {{ include "harbor.labels" . | nindent 4 }} -{{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} -{{- end }} -spec: - jobLabel: app.kubernetes.io/name - endpoints: - - port: {{ template "harbor.metricsPortName" . }} - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - honorLabels: true -{{- if .Values.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: -{{ tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | indent 4) . }} -{{- end }} -{{- if .Values.metrics.serviceMonitor.relabelings }} - relabelings: -{{ toYaml .Values.metrics.serviceMonitor.relabelings | indent 4 }} -{{- end }} - selector: - matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/nginx/configmap-http.yaml b/charts/harbor/harbor/1.15.1/templates/nginx/configmap-http.yaml deleted file mode 100644 index c4b8354d06..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/nginx/configmap-http.yaml +++ /dev/null @@ -1,150 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") (not .Values.expose.tls.enabled) }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server {{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled}} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end }} - server_tokens off; - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # Add extra headers - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - proxy_send_timeout 900; - proxy_read_timeout 900; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/nginx/configmap-https.yaml b/charts/harbor/harbor/1.15.1/templates/nginx/configmap-https.yaml deleted file mode 100644 index 56c943a619..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/nginx/configmap-https.yaml +++ /dev/null @@ -1,187 +0,0 @@ -{{- if and (ne .Values.expose.type "ingress") .Values.expose.tls.enabled }} -{{- $scheme := (include "harbor.component.scheme" .) -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - - events { - worker_connections 3096; - use epoll; - multi_accept on; - } - - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - tcp_nodelay on; - - # this is necessary for us to be able to disable request buffering in all cases - proxy_http_version 1.1; - - upstream core { - server "{{ template "harbor.core" . }}:{{ template "harbor.core.servicePort" . }}"; - } - - upstream portal { - server "{{ template "harbor.portal" . }}:{{ template "harbor.portal.servicePort" . }}"; - } - - log_format timed_combined '[$time_local]:$remote_addr - ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time $upstream_response_time $pipe'; - - access_log /dev/stdout timed_combined; - - map $http_x_forwarded_proto $x_forwarded_proto { - default $http_x_forwarded_proto; - "" $scheme; - } - - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8443 ssl; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8443 ssl; - {{- end }} - # server_name harbordomain.com; - server_tokens off; - # SSL - ssl_certificate /etc/nginx/cert/tls.crt; - ssl_certificate_key /etc/nginx/cert/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - - # disable any limits to avoid HTTP 413 for large image uploads - client_max_body_size 0; - - # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486) - chunked_transfer_encoding on; - - # Add extra headers - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; - add_header X-Frame-Options DENY; - add_header Content-Security-Policy "frame-ancestors 'none'"; - - location / { - proxy_pass {{ $scheme }}://portal/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; HttpOnly; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /api/ { - proxy_pass {{ $scheme }}://core/api/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /chartrepo/ { - proxy_pass {{ $scheme }}://core/chartrepo/; - {{- if and .Values.internalTLS.enabled }} - proxy_ssl_verify off; - proxy_ssl_session_reuse on; - {{- end }} - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /c/ { - proxy_pass {{ $scheme }}://core/c/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /v1/ { - return 404; - } - - location /v2/ { - proxy_pass {{ $scheme }}://core/v2/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/ { - proxy_pass {{ $scheme }}://core/service/; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $x_forwarded_proto; - - proxy_cookie_path / "/; Secure"; - - proxy_buffering off; - proxy_request_buffering off; - } - - location /service/notifications { - return 404; - } - } - server { - {{- if .Values.ipFamily.ipv4.enabled }} - listen 8080; - {{- end}} - {{- if .Values.ipFamily.ipv6.enabled }} - listen [::]:8080; - {{- end}} - #server_name harbordomain.com; - return 301 https://$host$request_uri; - } - } -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/nginx/deployment.yaml b/charts/harbor/harbor/1.15.1/templates/nginx/deployment.yaml deleted file mode 100644 index 3abc941989..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/nginx/deployment.yaml +++ /dev/null @@ -1,132 +0,0 @@ -{{- if ne .Values.expose.type "ingress" }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: nginx - app.kubernetes.io/component: nginx -spec: - replicas: {{ .Values.nginx.replicas }} - revisionHistoryLimit: {{ .Values.nginx.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: nginx - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: nginx - app.kubernetes.io/component: nginx -{{- if .Values.nginx.podLabels }} -{{ toYaml .Values.nginx.podLabels | indent 8 }} -{{- end }} - annotations: - {{- if not .Values.expose.tls.enabled }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-http.yaml") . | sha256sum }} - {{- else }} - checksum/configmap: {{ include (print $.Template.BasePath "/nginx/configmap-https.yaml") . | sha256sum }} - {{- end }} - {{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} - checksum/secret: {{ include (print $.Template.BasePath "/nginx/secret.yaml") . | sha256sum }} - {{- end }} -{{- if .Values.nginx.podAnnotations }} -{{ toYaml .Values.nginx.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- if .Values.nginx.serviceAccountName }} - serviceAccountName: {{ .Values.nginx.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken | default false }} -{{- with .Values.nginx.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: nginx -{{- end }} -{{- end }} - containers: - - name: nginx - image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - {{- $_ := set . "scheme" "HTTP" -}} - {{- $_ := set . "port" "8080" -}} - {{- if .Values.expose.tls.enabled }} - {{- $_ := set . "scheme" "HTTPS" -}} - {{- $_ := set . "port" "8443" -}} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - scheme: {{ .scheme }} - path: / - port: {{ .port }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.nginx.resources }} - resources: -{{ toYaml .Values.nginx.resources | indent 10 }} -{{- end }} -{{- with .Values.nginx.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - ports: - - containerPort: 8080 - {{- if .Values.expose.tls.enabled }} - - containerPort: 8443 - {{- end }} - volumeMounts: - - name: config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.expose.tls.enabled }} - - name: certificate - mountPath: /etc/nginx/cert - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "harbor.nginx" . }} - {{- if .Values.expose.tls.enabled }} - - name: certificate - secret: - secretName: {{ template "harbor.tlsSecretForNginx" . }} - {{- end }} - {{- with .Values.nginx.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.nginx.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.nginx.priorityClassName }} - priorityClassName: {{ .Values.nginx.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/nginx/secret.yaml b/charts/harbor/harbor/1.15.1/templates/nginx/secret.yaml deleted file mode 100644 index c819c556d9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/nginx/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if eq (include "harbor.autoGenCertForNginx" .) "true" }} -{{- $ca := genCA "harbor-ca" 365 }} -{{- $cn := (required "The \"expose.tls.auto.commonName\" is required!" .Values.expose.tls.auto.commonName) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.nginx" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if regexMatch `^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$` $cn }} - {{- $cert := genSignedCert $cn (list $cn) nil 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- else }} - {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }} - tls.crt: {{ $cert.Cert | b64enc | quote }} - tls.key: {{ $cert.Key | b64enc | quote }} - ca.crt: {{ $ca.Cert | b64enc | quote }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/nginx/service.yaml b/charts/harbor/harbor/1.15.1/templates/nginx/service.yaml deleted file mode 100644 index 691584ce02..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/nginx/service.yaml +++ /dev/null @@ -1,94 +0,0 @@ -{{- if or (eq .Values.expose.type "clusterIP") (eq .Values.expose.type "nodePort") (eq .Values.expose.type "loadBalancer") }} -apiVersion: v1 -kind: Service -metadata: -{{- if eq .Values.expose.type "clusterIP" }} -{{- $clusterIP := .Values.expose.clusterIP }} - name: {{ $clusterIP.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.clusterIP.labels }} -{{ toYaml $clusterIP.labels | indent 4 }} -{{- end }} -{{- with $clusterIP.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: ClusterIP - {{- if .Values.expose.clusterIP.staticClusterIP }} - clusterIP: {{ .Values.expose.clusterIP.staticClusterIP }} - {{- end }} - ports: - - name: http - port: {{ $clusterIP.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $clusterIP.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- else if eq .Values.expose.type "nodePort" }} -{{- $nodePort := .Values.expose.nodePort }} - name: {{ $nodePort.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.nodePort.labels }} -{{ toYaml $nodePort.labels | indent 4 }} -{{- end }} -{{- with $nodePort.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: NodePort - ports: - - name: http - port: {{ $nodePort.ports.http.port }} - targetPort: 8080 - {{- if $nodePort.ports.http.nodePort }} - nodePort: {{ $nodePort.ports.http.nodePort }} - {{- end }} - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $nodePort.ports.https.port }} - targetPort: 8443 - {{- if $nodePort.ports.https.nodePort }} - nodePort: {{ $nodePort.ports.https.nodePort }} - {{- end }} - {{- end }} -{{- else if eq .Values.expose.type "loadBalancer" }} -{{- $loadBalancer := .Values.expose.loadBalancer }} - name: {{ $loadBalancer.name }} - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- if .Values.expose.loadBalancer.labels }} -{{ toYaml $loadBalancer.labels | indent 4 }} -{{- end }} -{{- with $loadBalancer.annotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - type: LoadBalancer - {{- with $loadBalancer.sourceRanges }} - loadBalancerSourceRanges: - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if $loadBalancer.IP }} - loadBalancerIP: {{ $loadBalancer.IP }} - {{- end }} - ports: - - name: http - port: {{ $loadBalancer.ports.httpPort }} - targetPort: 8080 - {{- if .Values.expose.tls.enabled }} - - name: https - port: {{ $loadBalancer.ports.httpsPort }} - targetPort: 8443 - {{- end }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: nginx -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/portal/configmap.yaml b/charts/harbor/harbor/1.15.1/templates/portal/configmap.yaml deleted file mode 100644 index 7b2118e721..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/portal/configmap.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - nginx.conf: |+ - worker_processes auto; - pid /tmp/nginx.pid; - events { - worker_connections 1024; - } - http { - client_body_temp_path /tmp/client_body_temp; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - server { - {{- if .Values.internalTLS.enabled }} - {{- if .Values.ipFamily.ipv4.enabled}} - listen {{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }} ssl; - {{- end }} - # SSL - ssl_certificate /etc/harbor/ssl/portal/tls.crt; - ssl_certificate_key /etc/harbor/ssl/portal/tls.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - ssl_protocols TLSv1.2 TLSv1.3; - {{- if .Values.internalTLS.strong_ssl_ciphers }} - ssl_ciphers ECDHE+AESGCM:DHE+AESGCM:ECDHE+RSA+SHA256:DHE+RSA+SHA256:!AES128; - {{ else }} - ssl_ciphers '!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES:'; - {{- end }} - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - {{- else }} - {{- if .Values.ipFamily.ipv4.enabled }} - listen {{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- if .Values.ipFamily.ipv6.enabled}} - listen [::]:{{ template "harbor.portal.containerPort" . }}; - {{- end }} - {{- end }} - server_name localhost; - root /usr/share/nginx/html; - index index.html index.htm; - include /etc/nginx/mime.types; - gzip on; - gzip_min_length 1000; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; - location /devcenter-api-2.0 { - try_files $uri $uri/ /swagger-ui-index.html; - } - location / { - try_files $uri $uri/ /index.html; - } - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - } - } diff --git a/charts/harbor/harbor/1.15.1/templates/portal/deployment.yaml b/charts/harbor/harbor/1.15.1/templates/portal/deployment.yaml deleted file mode 100644 index 4dea944382..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/portal/deployment.yaml +++ /dev/null @@ -1,123 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: portal - app.kubernetes.io/component: portal -spec: - replicas: {{ .Values.portal.replicas }} - revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: portal - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: portal - app.kubernetes.io/component: portal -{{- if .Values.portal.podLabels }} -{{ toYaml .Values.portal.podLabels | indent 8 }} -{{- end }} - annotations: -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/portal/tls.yaml") . | sha256sum }} -{{- end }} - checksum/configmap: {{ include (print $.Template.BasePath "/portal/configmap.yaml") . | sha256sum }} -{{- if .Values.portal.podAnnotations }} -{{ toYaml .Values.portal.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- if .Values.portal.serviceAccountName }} - serviceAccountName: {{ .Values.portal.serviceAccountName }} -{{- end }} - automountServiceAccountToken: {{ .Values.portal.automountServiceAccountToken | default false }} -{{- with .Values.portal.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: portal -{{- end }} -{{- end }} - {{- with .Values.portal.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: portal - image: {{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} -{{- if .Values.portal.resources }} - resources: -{{ toYaml .Values.portal.resources | indent 10 }} -{{- end }} -{{- with .Values.portal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.portal.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 - ports: - - containerPort: {{ template "harbor.portal.containerPort" . }} - volumeMounts: - - name: portal-config - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - mountPath: /etc/harbor/ssl/portal - {{- end }} - volumes: - - name: portal-config - configMap: - name: "{{ template "harbor.portal" . }}" - {{- if .Values.internalTLS.enabled }} - - name: portal-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.portal.secretName" . }} - {{- end }} - {{- with .Values.portal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.portal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.portal.priorityClassName }} - priorityClassName: {{ .Values.portal.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/portal/service.yaml b/charts/harbor/harbor/1.15.1/templates/portal/service.yaml deleted file mode 100644 index d00026da46..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/portal/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.portal" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -{{- with .Values.portal.serviceAnnotations }} - annotations: - {{- toYaml . | nindent 4 }} -{{- end }} -spec: -{{- if or (eq .Values.expose.ingress.controller "gce") (eq .Values.expose.ingress.controller "alb") (eq .Values.expose.ingress.controller "f5-bigip") }} - type: NodePort -{{- end }} - ports: - - port: {{ template "harbor.portal.servicePort" . }} - targetPort: {{ template "harbor.portal.containerPort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: portal diff --git a/charts/harbor/harbor/1.15.1/templates/portal/tls.yaml b/charts/harbor/harbor/1.15.1/templates/portal/tls.yaml deleted file mode 100644 index de63f4e813..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/portal/tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.portal.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.portal.crt\" is required!" .Values.internalTLS.portal.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.portal.key\" is required!" .Values.internalTLS.portal.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/redis/service.yaml b/charts/harbor/harbor/1.15.1/templates/redis/service.yaml deleted file mode 100644 index 79c95c3e05..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/redis/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - port: 6379 - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: redis -{{- end -}} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/redis/statefulset.yaml b/charts/harbor/harbor/1.15.1/templates/redis/statefulset.yaml deleted file mode 100644 index 1d37fb184b..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/redis/statefulset.yaml +++ /dev/null @@ -1,125 +0,0 @@ -{{- if eq .Values.redis.type "internal" -}} -{{- $redis := .Values.persistence.persistentVolumeClaim.redis -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.redis" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: redis - app.kubernetes.io/component: redis -spec: - replicas: 1 - serviceName: {{ template "harbor.redis" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: redis - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: redis - app.kubernetes.io/component: redis -{{- if .Values.redis.podLabels }} -{{ toYaml .Values.redis.podLabels | indent 8 }} -{{- end }} -{{- if .Values.redis.podAnnotations }} - annotations: -{{ toYaml .Values.redis.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 999 - fsGroup: 999 -{{- if .Values.redis.internal.serviceAccountName }} - serviceAccountName: {{ .Values.redis.internal.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 - {{- with .Values.redis.internal.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: redis - image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - livenessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - tcpSocket: - port: 6379 - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.redis.internal.resources }} - resources: -{{ toYaml .Values.redis.internal.resources | indent 10 }} -{{- end }} -{{- with .Values.redis.internal.extraEnvVars }} - env: -{{- toYaml . | nindent 10 }} -{{- end }} - volumeMounts: - - name: data - mountPath: /var/lib/redis - subPath: {{ $redis.subPath }} - {{- if not .Values.persistence.enabled }} - volumes: - - name: data - emptyDir: {} - {{- else if $redis.existingClaim }} - volumes: - - name: data - persistentVolumeClaim: - claimName: {{ $redis.existingClaim }} - {{- end -}} - {{- with .Values.redis.internal.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.redis.internal.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.redis.internal.priorityClassName }} - priorityClassName: {{ .Values.redis.internal.priorityClassName }} - {{- end }} - {{- if and .Values.persistence.enabled (not $redis.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $redis.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $redis.accessMode | quote }}] - {{- if $redis.storageClass }} - {{- if (eq "-" $redis.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $redis.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $redis.size | quote }} - {{- end -}} - {{- end -}} diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-cm.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-cm.yaml deleted file mode 100644 index 4f7056c384..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-cm.yaml +++ /dev/null @@ -1,246 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - config.yml: |+ - version: 0.1 - log: - {{- if eq .Values.logLevel "warning" }} - level: warn - {{- else if eq .Values.logLevel "fatal" }} - level: error - {{- else }} - level: {{ .Values.logLevel }} - {{- end }} - fields: - service: registry - storage: - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if eq $type "filesystem" }} - filesystem: - rootdirectory: {{ $storage.filesystem.rootdirectory }} - {{- if $storage.filesystem.maxthreads }} - maxthreads: {{ $storage.filesystem.maxthreads }} - {{- end }} - {{- else if eq $type "azure" }} - azure: - accountname: {{ $storage.azure.accountname }} - container: {{ $storage.azure.container }} - {{- if $storage.azure.realm }} - realm: {{ $storage.azure.realm }} - {{- end }} - {{- else if eq $type "gcs" }} - gcs: - bucket: {{ $storage.gcs.bucket }} - {{- if not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity }} - keyfile: /etc/registry/gcs-key.json - {{- end }} - {{- if $storage.gcs.rootdirectory }} - rootdirectory: {{ $storage.gcs.rootdirectory }} - {{- end }} - {{- if $storage.gcs.chunksize }} - chunksize: {{ $storage.gcs.chunksize }} - {{- end }} - {{- else if eq $type "s3" }} - s3: - region: {{ $storage.s3.region }} - bucket: {{ $storage.s3.bucket }} - {{- if $storage.s3.regionendpoint }} - regionendpoint: {{ $storage.s3.regionendpoint }} - {{- end }} - {{- if $storage.s3.encrypt }} - encrypt: {{ $storage.s3.encrypt }} - {{- end }} - {{- if $storage.s3.keyid }} - keyid: {{ $storage.s3.keyid }} - {{- end }} - {{- if $storage.s3.secure }} - secure: {{ $storage.s3.secure }} - {{- end }} - {{- if and $storage.s3.secure $storage.s3.skipverify }} - skipverify: {{ $storage.s3.skipverify }} - {{- end }} - {{- if $storage.s3.v4auth }} - v4auth: {{ $storage.s3.v4auth }} - {{- end }} - {{- if $storage.s3.chunksize }} - chunksize: {{ $storage.s3.chunksize }} - {{- end }} - {{- if $storage.s3.rootdirectory }} - rootdirectory: {{ $storage.s3.rootdirectory }} - {{- end }} - {{- if $storage.s3.storageclass }} - storageclass: {{ $storage.s3.storageclass }} - {{- end }} - {{- if $storage.s3.multipartcopychunksize }} - multipartcopychunksize: {{ $storage.s3.multipartcopychunksize }} - {{- end }} - {{- if $storage.s3.multipartcopymaxconcurrency }} - multipartcopymaxconcurrency: {{ $storage.s3.multipartcopymaxconcurrency }} - {{- end }} - {{- if $storage.s3.multipartcopythresholdsize }} - multipartcopythresholdsize: {{ $storage.s3.multipartcopythresholdsize }} - {{- end }} - {{- else if eq $type "swift" }} - swift: - authurl: {{ $storage.swift.authurl }} - username: {{ $storage.swift.username }} - container: {{ $storage.swift.container }} - {{- if $storage.swift.region }} - region: {{ $storage.swift.region }} - {{- end }} - {{- if $storage.swift.tenant }} - tenant: {{ $storage.swift.tenant }} - {{- end }} - {{- if $storage.swift.tenantid }} - tenantid: {{ $storage.swift.tenantid }} - {{- end }} - {{- if $storage.swift.domain }} - domain: {{ $storage.swift.domain }} - {{- end }} - {{- if $storage.swift.domainid }} - domainid: {{ $storage.swift.domainid }} - {{- end }} - {{- if $storage.swift.trustid }} - trustid: {{ $storage.swift.trustid }} - {{- end }} - {{- if $storage.swift.insecureskipverify }} - insecureskipverify: {{ $storage.swift.insecureskipverify }} - {{- end }} - {{- if $storage.swift.chunksize }} - chunksize: {{ $storage.swift.chunksize }} - {{- end }} - {{- if $storage.swift.prefix }} - prefix: {{ $storage.swift.prefix }} - {{- end }} - {{- if $storage.swift.authversion }} - authversion: {{ $storage.swift.authversion }} - {{- end }} - {{- if $storage.swift.endpointtype }} - endpointtype: {{ $storage.swift.endpointtype }} - {{- end }} - {{- if $storage.swift.tempurlcontainerkey }} - tempurlcontainerkey: {{ $storage.swift.tempurlcontainerkey }} - {{- end }} - {{- if $storage.swift.tempurlmethods }} - tempurlmethods: {{ $storage.swift.tempurlmethods }} - {{- end }} - {{- else if eq $type "oss" }} - oss: - accesskeyid: {{ $storage.oss.accesskeyid }} - region: {{ $storage.oss.region }} - bucket: {{ $storage.oss.bucket }} - {{- if $storage.oss.endpoint }} - endpoint: {{ $storage.oss.bucket }}.{{ $storage.oss.endpoint }} - {{- end }} - {{- if $storage.oss.internal }} - internal: {{ $storage.oss.internal }} - {{- end }} - {{- if $storage.oss.encrypt }} - encrypt: {{ $storage.oss.encrypt }} - {{- end }} - {{- if $storage.oss.secure }} - secure: {{ $storage.oss.secure }} - {{- end }} - {{- if $storage.oss.chunksize }} - chunksize: {{ $storage.oss.chunksize }} - {{- end }} - {{- if $storage.oss.rootdirectory }} - rootdirectory: {{ $storage.oss.rootdirectory }} - {{- end }} - {{- end }} - cache: - layerinfo: redis - maintenance: - uploadpurging: - {{- if .Values.registry.upload_purging.enabled }} - enabled: true - age: {{ .Values.registry.upload_purging.age }} - interval: {{ .Values.registry.upload_purging.interval }} - dryrun: {{ .Values.registry.upload_purging.dryrun }} - {{- else }} - enabled: false - {{- end }} - delete: - enabled: true - redirect: - disable: {{ $storage.disableredirect }} - redis: - addr: {{ template "harbor.redis.addr" . }} - {{- if eq "redis+sentinel" (include "harbor.redis.scheme" .) }} - sentinelMasterSet: {{ template "harbor.redis.masterSet" . }} - {{- end }} - db: {{ template "harbor.redis.dbForRegistry" . }} - {{- if not (eq (include "harbor.redis.password" .) "") }} - password: {{ template "harbor.redis.password" . }} - {{- end }} - readtimeout: 10s - writetimeout: 10s - dialtimeout: 10s - pool: - maxidle: 100 - maxactive: 500 - idletimeout: 60s - http: - addr: :{{ template "harbor.registry.containerPort" . }} - relativeurls: {{ .Values.registry.relativeurls }} - {{- if .Values.internalTLS.enabled }} - tls: - certificate: /etc/harbor/ssl/registry/tls.crt - key: /etc/harbor/ssl/registry/tls.key - minimumtls: tls1.2 - {{- end }} - # set via environment variable - # secret: placeholder - debug: - {{- if .Values.metrics.enabled}} - addr: :{{ .Values.metrics.registry.port }} - prometheus: - enabled: true - path: {{ .Values.metrics.registry.path }} - {{- else }} - addr: localhost:5001 - {{- end }} - auth: - htpasswd: - realm: harbor-registry-basic-realm - path: /etc/registry/passwd - validation: - disabled: true - compatibility: - schema1: - enabled: true - - {{- if .Values.registry.middleware.enabled }} - {{- $middleware := .Values.registry.middleware }} - {{- $middlewareType := $middleware.type }} - {{- if eq $middlewareType "cloudFront" }} - middleware: - storage: - - name: cloudfront - options: - baseurl: {{ $middleware.cloudFront.baseurl }} - privatekey: /etc/registry/pk.pem - keypairid: {{ $middleware.cloudFront.keypairid }} - duration: {{ $middleware.cloudFront.duration }} - ipfilteredby: {{ $middleware.cloudFront.ipfilteredby }} - {{- end }} - {{- end }} - ctl-config.yml: |+ - --- - {{- if .Values.internalTLS.enabled }} - protocol: "https" - port: 8443 - https_config: - cert: "/etc/harbor/ssl/registry/tls.crt" - key: "/etc/harbor/ssl/registry/tls.key" - {{- else }} - protocol: "http" - port: 8080 - {{- end }} - log_level: {{ .Values.logLevel }} - registry_config: "/etc/registry/config.yml" diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-dpl.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-dpl.yaml deleted file mode 100644 index 0965cf2e2a..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-dpl.yaml +++ /dev/null @@ -1,431 +0,0 @@ -{{- $storage := .Values.persistence.imageChartStorage }} -{{- $type := $storage.type }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry - app.kubernetes.io/component: registry -spec: - replicas: {{ .Values.registry.replicas }} - revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }} - strategy: - type: {{ .Values.updateStrategy.type }} - {{- if eq .Values.updateStrategy.type "Recreate" }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: registry - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: registry - app.kubernetes.io/component: registry -{{- if .Values.registry.podLabels }} -{{ toYaml .Values.registry.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/configmap: {{ include (print $.Template.BasePath "/registry/registry-cm.yaml") . | sha256sum }} - checksum/secret: {{ include (print $.Template.BasePath "/registry/registry-secret.yaml") . | sha256sum }} - checksum/secret-jobservice: {{ include (print $.Template.BasePath "/jobservice/jobservice-secrets.yaml") . | sha256sum }} - checksum/secret-core: {{ include (print $.Template.BasePath "/core/core-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/registry/registry-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.registry.podAnnotations }} -{{ toYaml .Values.registry.podAnnotations | indent 8 }} -{{- end }} - spec: - securityContext: - runAsUser: 10000 - fsGroup: 10000 - fsGroupChangePolicy: OnRootMismatch -{{- if .Values.registry.serviceAccountName }} - serviceAccountName: {{ .Values.registry.serviceAccountName }} -{{- end -}} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - automountServiceAccountToken: {{ .Values.registry.automountServiceAccountToken | default false }} - terminationGracePeriodSeconds: 120 -{{- with .Values.registry.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: registry -{{- end }} -{{- end }} - {{- with .Values.registry.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: registry - image: {{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registry.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.registry.resources }} - resources: -{{ toYaml .Values.registry.registry.resources | indent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - args: ["serve", "/etc/registry/config.yml"] - envFrom: - - secretRef: - name: "{{ template "harbor.registry" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.registry.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registry.containerPort" . }} - - containerPort: {{ ternary .Values.metrics.registry.port 5001 .Values.metrics.enabled }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-htpasswd - mountPath: /etc/registry/passwd - subPath: passwd - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - mountPath: /etc/registry/pk.pem - subPath: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - - name: registryctl - image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - livenessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 300 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /api/health - scheme: {{ include "harbor.component.scheme" . | upper }} - port: {{ template "harbor.registryctl.containerPort" . }} - initialDelaySeconds: 1 - periodSeconds: 10 -{{- if .Values.registry.controller.resources }} - resources: -{{ toYaml .Values.registry.controller.resources | indent 10 }} -{{- end }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 10 }} - {{- end }} - envFrom: - - configMapRef: - name: "{{ template "harbor.registryCtl" . }}" - - secretRef: - name: "{{ template "harbor.registry" . }}" - - secretRef: - name: "{{ template "harbor.registryCtl" . }}" - {{- if .Values.persistence.imageChartStorage.s3.existingSecret }} - - secretRef: - name: {{ .Values.persistence.imageChartStorage.s3.existingSecret }} - {{- end }} - env: - {{- if .Values.registry.existingSecret }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ .Values.registry.existingSecret }} - key: {{ .Values.registry.existingSecretKey }} - {{- end }} - - name: CORE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.core" .) .Values.core.existingSecret }} - key: secret - - name: JOBSERVICE_SECRET - valueFrom: - secretKeyRef: - name: {{ default (include "harbor.jobservice" .) .Values.jobservice.existingSecret }} - {{- if .Values.jobservice.existingSecret }} - key: {{ .Values.jobservice.existingSecretKey }} - {{- else }} - key: JOBSERVICE_SECRET - {{- end }} - {{- if has "registry" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: INTERNAL_TLS_KEY_PATH - value: /etc/harbor/ssl/registry/tls.key - - name: INTERNAL_TLS_CERT_PATH - value: /etc/harbor/ssl/registry/tls.crt - - name: INTERNAL_TLS_TRUST_CA_PATH - value: /etc/harbor/ssl/registry/ca.crt - {{- end }} - {{- if .Values.redis.external.existingSecret }} - - name: REGISTRY_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.redis.external.existingSecret }} - key: REDIS_PASSWORD - {{- end }} - {{- if .Values.persistence.imageChartStorage.azure.existingSecret }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.azure.existingSecret }} - key: AZURE_STORAGE_ACCESS_KEY - {{- end }} - {{- if .Values.persistence.imageChartStorage.swift.existingSecret }} - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_PASSWORD - - name: REGISTRY_STORAGE_SWIFT_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_SECRETKEY - optional: true - - name: REGISTRY_STORAGE_SWIFT_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.swift.existingSecret }} - key: REGISTRY_STORAGE_SWIFT_ACCESSKEY - optional: true - {{- end }} - {{- if .Values.persistence.imageChartStorage.oss.existingSecret }} - - name: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - valueFrom: - secretKeyRef: - name: {{ .Values.persistence.imageChartStorage.oss.existingSecret }} - key: REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - optional: true - {{- end}} -{{- with .Values.registry.controller.extraEnvVars }} -{{- toYaml . | nindent 8 }} -{{- end }} - ports: - - containerPort: {{ template "harbor.registryctl.containerPort" . }} - volumeMounts: - - name: registry-data - mountPath: {{ .Values.persistence.imageChartStorage.filesystem.rootdirectory }} - subPath: {{ .Values.persistence.persistentVolumeClaim.registry.subPath }} - - name: registry-config - mountPath: /etc/registry/config.yml - subPath: config.yml - - name: registry-config - mountPath: /etc/registryctl/config.yml - subPath: ctl-config.yml - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - mountPath: /etc/harbor/ssl/registry - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - mountPath: /harbor_cust_cert/custom-ca-bundle.crt - subPath: ca.crt - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - mountPath: /etc/registry/gcs-key.json - subPath: gcs-key.json - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 8 }} - {{- end }} - volumes: - - name: registry-htpasswd - secret: - {{- if not .Values.registry.credentials.existingSecret }} - secretName: {{ template "harbor.registry" . }}-htpasswd - {{ else }} - secretName: {{ .Values.registry.credentials.existingSecret }} - {{- end }} - items: - - key: REGISTRY_HTPASSWD - path: passwd - - name: registry-config - configMap: - 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: {} - {{- end }} - {{- if .Values.internalTLS.enabled }} - - name: registry-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.registry.secretName" . }} - {{- end }} - {{- if and (and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs")) (not .Values.persistence.imageChartStorage.gcs.useWorkloadIdentity ) }} - - name: gcs-key - secret: - {{- if and (eq $type "gcs") $storage.gcs.existingSecret }} - secretName: {{ $storage.gcs.existingSecret }} - {{- else }} - secretName: {{ template "harbor.registry" . }} - {{- end }} - items: - - key: GCS_KEY_DATA - path: gcs-key.json - {{- end }} - {{- if .Values.persistence.imageChartStorage.caBundleSecretName }} - - name: storage-service-ca - secret: - secretName: {{ .Values.persistence.imageChartStorage.caBundleSecretName }} - {{- end }} - {{- if .Values.registry.middleware.enabled }} - {{- if eq .Values.registry.middleware.type "cloudFront" }} - - name: cloudfront-key - secret: - secretName: {{ .Values.registry.middleware.cloudFront.privateKeySecret }} - items: - - key: CLOUDFRONT_KEY_DATA - path: pk.pem - {{- end }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- with .Values.registry.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.registry.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.registry.priorityClassName }} - priorityClassName: {{ .Values.registry.priorityClassName }} - {{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-pvc.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-pvc.yaml deleted file mode 100644 index 5d6d4d3ddf..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-pvc.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- $registry := .Values.persistence.persistentVolumeClaim.registry -}} -{{- if and (not $registry.existingClaim) (eq .Values.persistence.imageChartStorage.type "filesystem") }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "harbor.registry" . }} - annotations: - {{- range $key, $value := $registry.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- if eq .Values.persistence.resourcePolicy "keep" }} - helm.sh/resource-policy: keep - {{- end }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: registry - app.kubernetes.io/component: registry -spec: - accessModes: - - {{ $registry.accessMode }} - resources: - requests: - storage: {{ $registry.size }} - {{- if $registry.storageClass }} - {{- if eq "-" $registry.storageClass }} - storageClassName: "" - {{- else }} - storageClassName: {{ $registry.storageClass }} - {{- end }} - {{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-secret.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-secret.yaml deleted file mode 100644 index e853a9cbec..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-secret.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (include "harbor.registry" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if not .Values.registry.existingSecret }} - REGISTRY_HTTP_SECRET: {{ .Values.registry.secret | default (include "harbor.secretKeyHelper" (dict "key" "REGISTRY_HTTP_SECRET" "data" $existingSecret.data)) | default (randAlphaNum 16) | b64enc | quote }} - {{- end }} - {{- if not .Values.redis.external.existingSecret }} - REGISTRY_REDIS_PASSWORD: {{ include "harbor.redis.password" . | b64enc | quote }} - {{- end }} - {{- $storage := .Values.persistence.imageChartStorage }} - {{- $type := $storage.type }} - {{- if and (eq $type "azure") (not $storage.azure.existingSecret) }} - REGISTRY_STORAGE_AZURE_ACCOUNTKEY: {{ $storage.azure.accountkey | b64enc | quote }} - {{- else if and (and (eq $type "gcs") (not $storage.gcs.existingSecret)) (not $storage.gcs.useWorkloadIdentity) }} - GCS_KEY_DATA: {{ $storage.gcs.encodedkey | quote }} - {{- else if eq $type "s3" }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.accesskey) }} - REGISTRY_STORAGE_S3_ACCESSKEY: {{ $storage.s3.accesskey | b64enc | quote }} - {{- end }} - {{- if and (not $storage.s3.existingSecret) ($storage.s3.secretkey) }} - REGISTRY_STORAGE_S3_SECRETKEY: {{ $storage.s3.secretkey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "swift") (not ($storage.swift.existingSecret)) }} - REGISTRY_STORAGE_SWIFT_PASSWORD: {{ $storage.swift.password | b64enc | quote }} - {{- if $storage.swift.secretkey }} - REGISTRY_STORAGE_SWIFT_SECRETKEY: {{ $storage.swift.secretkey | b64enc | quote }} - {{- end }} - {{- if $storage.swift.accesskey }} - REGISTRY_STORAGE_SWIFT_ACCESSKEY: {{ $storage.swift.accesskey | b64enc | quote }} - {{- end }} - {{- else if and (eq $type "oss") ((not ($storage.oss.existingSecret))) }} - REGISTRY_STORAGE_OSS_ACCESSKEYSECRET: {{ $storage.oss.accesskeysecret | b64enc | quote }} - {{- end }} -{{- if not .Values.registry.credentials.existingSecret }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registry" . }}-htpasswd" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- if .Values.registry.credentials.htpasswdString }} - REGISTRY_HTPASSWD: {{ .Values.registry.credentials.htpasswdString | b64enc | quote }} - {{- else }} - REGISTRY_HTPASSWD: {{ htpasswd .Values.registry.credentials.username .Values.registry.credentials.password | b64enc | quote }} - {{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-svc.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-svc.yaml deleted file mode 100644 index 749690ea03..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.registry" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-registry" "http-registry" .Values.internalTLS.enabled }} - port: {{ template "harbor.registry.servicePort" . }} - - - name: {{ ternary "https-controller" "http-controller" .Values.internalTLS.enabled }} - port: {{ template "harbor.registryctl.servicePort" . }} -{{- if .Values.metrics.enabled}} - - name: {{ template "harbor.metricsPortName" . }} - port: {{ .Values.metrics.registry.port }} -{{- end }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: registry \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registry-tls.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registry-tls.yaml deleted file mode 100644 index 9d1862c417..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registry-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.registry.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.registry.crt\" is required!" .Values.internalTLS.registry.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.registry.key\" is required!" .Values.internalTLS.registry.key) | b64enc | quote }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registryctl-cm.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registryctl-cm.yaml deleted file mode 100644 index 87aa5ffe24..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registryctl-cm.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -data: - {{- template "harbor.traceEnvsForRegistryCtl" . }} diff --git a/charts/harbor/harbor/1.15.1/templates/registry/registryctl-secret.yaml b/charts/harbor/harbor/1.15.1/templates/registry/registryctl-secret.yaml deleted file mode 100644 index 70097703e9..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/registry/registryctl-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.registryCtl" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - {{- template "harbor.traceJaegerPassword" . }} \ No newline at end of file diff --git a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-secret.yaml b/charts/harbor/harbor/1.15.1/templates/trivy/trivy-secret.yaml deleted file mode 100644 index 84652c7498..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.trivy.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} -type: Opaque -data: - redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }} - gitHubToken: {{ .Values.trivy.gitHubToken | default "" | b64enc | quote }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-sts.yaml b/charts/harbor/harbor/1.15.1/templates/trivy/trivy-sts.yaml deleted file mode 100644 index c876ba3878..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-sts.yaml +++ /dev/null @@ -1,230 +0,0 @@ -{{- if .Values.trivy.enabled }} -{{- $trivy := .Values.persistence.persistentVolumeClaim.trivy }} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ template "harbor.trivy" . }} - labels: -{{ include "harbor.labels" . | indent 4 }} - component: trivy - app.kubernetes.io/component: trivy -spec: - replicas: {{ .Values.trivy.replicas }} - serviceName: {{ template "harbor.trivy" . }} - selector: - matchLabels: -{{ include "harbor.matchLabels" . | indent 6 }} - component: trivy - template: - metadata: - labels: -{{ include "harbor.labels" . | indent 8 }} - component: trivy - app.kubernetes.io/component: trivy -{{- if .Values.trivy.podLabels }} -{{ toYaml .Values.trivy.podLabels | indent 8 }} -{{- end }} - annotations: - checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }} -{{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }} - checksum/tls: {{ include (print $.Template.BasePath "/internal/auto-tls.yaml") . | sha256sum }} -{{- else if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "manual") }} - checksum/tls: {{ include (print $.Template.BasePath "/trivy/trivy-tls.yaml") . | sha256sum }} -{{- end }} -{{- if .Values.trivy.podAnnotations }} -{{ toYaml .Values.trivy.podAnnotations | indent 8 }} -{{- end }} - spec: -{{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} -{{- end }} -{{- if .Values.trivy.serviceAccountName }} - serviceAccountName: {{ .Values.trivy.serviceAccountName }} -{{- end }} - securityContext: - runAsUser: 10000 - fsGroup: 10000 - automountServiceAccountToken: {{ .Values.trivy.automountServiceAccountToken | default false }} -{{- with .Values.trivy.topologySpreadConstraints}} - topologySpreadConstraints: -{{- range . }} - - {{ . | toYaml | indent 8 | trim }} - labelSelector: - matchLabels: -{{ include "harbor.matchLabels" $ | indent 12 }} - component: trivy -{{- end }} -{{- end }} - {{- with .Values.trivy.initContainers }} - initContainers: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: trivy - image: {{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if not (empty .Values.containerSecurityContext) }} - securityContext: {{ .Values.containerSecurityContext | toYaml | nindent 12 }} - {{- end }} - env: - {{- if has "trivy" .Values.proxy.components }} - - name: HTTP_PROXY - value: "{{ .Values.proxy.httpProxy }}" - - name: HTTPS_PROXY - value: "{{ .Values.proxy.httpsProxy }}" - - name: NO_PROXY - value: "{{ template "harbor.noProxy" . }}" - {{- end }} - - name: "SCANNER_LOG_LEVEL" - value: {{ .Values.logLevel | quote }} - - name: "SCANNER_TRIVY_CACHE_DIR" - value: "/home/scanner/.cache/trivy" - - name: "SCANNER_TRIVY_REPORTS_DIR" - value: "/home/scanner/.cache/reports" - - name: "SCANNER_TRIVY_DEBUG_MODE" - value: {{ .Values.trivy.debugMode | quote }} - - name: "SCANNER_TRIVY_VULN_TYPE" - value: {{ .Values.trivy.vulnType | quote }} - - name: "SCANNER_TRIVY_TIMEOUT" - value: {{ .Values.trivy.timeout | quote }} - - name: "SCANNER_TRIVY_GITHUB_TOKEN" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: gitHubToken - - name: "SCANNER_TRIVY_SEVERITY" - value: {{ .Values.trivy.severity | quote }} - - name: "SCANNER_TRIVY_IGNORE_UNFIXED" - value: {{ .Values.trivy.ignoreUnfixed | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_UPDATE" - value: {{ .Values.trivy.skipUpdate | default false | quote }} - - name: "SCANNER_TRIVY_SKIP_JAVA_DB_UPDATE" - value: {{ .Values.trivy.skipJavaDBUpdate | default false | quote }} - - name: "SCANNER_TRIVY_OFFLINE_SCAN" - value: {{ .Values.trivy.offlineScan | default false | quote }} - - name: "SCANNER_TRIVY_SECURITY_CHECKS" - value: {{ .Values.trivy.securityCheck | quote }} - - name: "SCANNER_TRIVY_INSECURE" - value: {{ .Values.trivy.insecure | default false | quote }} - - name: SCANNER_API_SERVER_ADDR - value: ":{{ template "harbor.trivy.containerPort" . }}" - {{- if .Values.internalTLS.enabled }} - - name: INTERNAL_TLS_ENABLED - value: "true" - - name: SCANNER_API_SERVER_TLS_KEY - value: /etc/harbor/ssl/trivy/tls.key - - name: SCANNER_API_SERVER_TLS_CERTIFICATE - value: /etc/harbor/ssl/trivy/tls.crt - {{- end }} - - name: "SCANNER_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_STORE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL - - name: "SCANNER_JOB_QUEUE_REDIS_URL" - valueFrom: - secretKeyRef: - name: {{ template "harbor.trivy" . }} - key: redisURL -{{- with .Values.trivy.extraEnvVars }} -{{- toYaml . | nindent 12 }} -{{- end }} - ports: - - name: api-server - containerPort: {{ template "harbor.trivy.containerPort" . }} - volumeMounts: - - name: data - mountPath: /home/scanner/.cache - subPath: {{ .Values.persistence.persistentVolumeClaim.trivy.subPath }} - readOnly: false - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - mountPath: /etc/harbor/ssl/trivy - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolumeMount" . | indent 10 }} - {{- end }} - livenessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/healthy - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 10 - readinessProbe: - httpGet: - scheme: {{ include "harbor.component.scheme" . | upper }} - path: /probe/ready - port: api-server - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - resources: -{{ toYaml .Values.trivy.resources | indent 12 }} - {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }} - volumes: - {{- if .Values.internalTLS.enabled }} - - name: trivy-internal-certs - secret: - secretName: {{ template "harbor.internalTLS.trivy.secretName" . }} - {{- end }} - {{- if .Values.caBundleSecretName }} -{{ include "harbor.caBundleVolume" . | indent 6 }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: "data" - emptyDir: {} - {{- else if $trivy.existingClaim }} - - name: "data" - persistentVolumeClaim: - claimName: {{ $trivy.existingClaim }} - {{- end }} - {{- end }} - {{- with .Values.trivy.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.trivy.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - {{- if .Values.trivy.priorityClassName }} - priorityClassName: {{ .Values.trivy.priorityClassName }} - {{- end }} -{{- if and .Values.persistence.enabled (not $trivy.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: -{{ include "harbor.legacy.labels" . | indent 8 }} - annotations: - {{- range $key, $value := $trivy.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - spec: - accessModes: [{{ $trivy.accessMode | quote }}] - {{- if $trivy.storageClass }} - {{- if (eq "-" $trivy.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ $trivy.storageClass }}" - {{- end }} - {{- end }} - resources: - requests: - storage: {{ $trivy.size | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-svc.yaml b/charts/harbor/harbor/1.15.1/templates/trivy/trivy-svc.yaml deleted file mode 100644 index 24daf094e8..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-svc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{ if .Values.trivy.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "harbor.trivy" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -spec: - ports: - - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }} - protocol: TCP - port: {{ template "harbor.trivy.servicePort" . }} - selector: -{{ include "harbor.matchLabels" . | indent 4 }} - component: trivy -{{ end }} diff --git a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-tls.yaml b/charts/harbor/harbor/1.15.1/templates/trivy/trivy-tls.yaml deleted file mode 100644 index a9c8330c37..0000000000 --- a/charts/harbor/harbor/1.15.1/templates/trivy/trivy-tls.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.trivy.enabled .Values.internalTLS.enabled }} -{{- if eq .Values.internalTLS.certSource "manual" }} -apiVersion: v1 -kind: Secret -metadata: - name: "{{ template "harbor.internalTLS.trivy.secretName" . }}" - labels: -{{ include "harbor.labels" . | indent 4 }} -type: kubernetes.io/tls -data: - ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }} - tls.crt: {{ (required "The \"internalTLS.trivy.crt\" is required!" .Values.internalTLS.trivy.crt) | b64enc | quote }} - tls.key: {{ (required "The \"internalTLS.trivy.key\" is required!" .Values.internalTLS.trivy.key) | b64enc | quote }} -{{- end }} -{{- end }} diff --git a/charts/harbor/harbor/1.15.1/values.yaml b/charts/harbor/harbor/1.15.1/values.yaml deleted file mode 100644 index ab8b62dc92..0000000000 --- a/charts/harbor/harbor/1.15.1/values.yaml +++ /dev/null @@ -1,1058 +0,0 @@ -expose: - # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer" - # and fill the information in the corresponding section - type: ingress - tls: - # Enable TLS or not. - # Delete the "ssl-redirect" annotations in "expose.ingress.annotations" when TLS is disabled and "expose.type" is "ingress" - # Note: if the "expose.type" is "ingress" and TLS is disabled, - # the port must be included in the command when pulling/pushing images. - # Refer to https://github.com/goharbor/harbor/issues/5291 for details. - enabled: true - # The source of the tls certificate. Set as "auto", "secret" - # or "none" and fill the information in the corresponding section - # 1) auto: generate the tls certificate automatically - # 2) secret: read the tls certificate from the specified secret. - # The tls certificate can be generated manually or by cert manager - # 3) none: configure no tls certificate for the ingress. If the default - # tls certificate is configured in the ingress controller, choose this option - certSource: auto - auto: - # The common name used to generate the certificate, it's necessary - # when the type isn't "ingress" - commonName: "" - secret: - # The name of secret which contains keys named: - # "tls.crt" - the certificate - # "tls.key" - the private key - secretName: "" - ingress: - hosts: - core: core.harbor.domain - # set to the type of ingress controller if it has specific requirements. - # leave as `default` for most ingress controllers. - # set to `gce` if using the GCE ingress controller - # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller - # set to `alb` if using the ALB ingress controller - # set to `f5-bigip` if using the F5 BIG-IP ingress controller - controller: default - ## Allow .Capabilities.KubeVersion.Version to be overridden while creating ingress - kubeVersionOverride: "" - className: "" - annotations: - # note different ingress controllers may require a different ssl-redirect annotation - # for Envoy, use ingress.kubernetes.io/force-ssl-redirect: "true" and remove the nginx lines below - ingress.kubernetes.io/ssl-redirect: "true" - ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "0" - # ingress-specific labels - labels: {} - clusterIP: - # The name of ClusterIP service - name: harbor - # The ip address of the ClusterIP service (leave empty for acquiring dynamic ip) - staticClusterIP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # Annotations on the ClusterIP service - annotations: {} - # ClusterIP-specific labels - labels: {} - nodePort: - # The name of NodePort service - name: harbor - ports: - http: - # The service port Harbor listens on when serving HTTP - port: 80 - # The node port Harbor listens on when serving HTTP - nodePort: 30002 - https: - # The service port Harbor listens on when serving HTTPS - port: 443 - # The node port Harbor listens on when serving HTTPS - nodePort: 30003 - # Annotations on the nodePort service - annotations: {} - # nodePort-specific labels - labels: {} - loadBalancer: - # The name of LoadBalancer service - name: harbor - # Set the IP if the LoadBalancer supports assigning IP - IP: "" - ports: - # The service port Harbor listens on when serving HTTP - httpPort: 80 - # The service port Harbor listens on when serving HTTPS - httpsPort: 443 - # Annotations on the loadBalancer service - annotations: {} - # loadBalancer-specific labels - labels: {} - sourceRanges: [] - -# The external URL for Harbor core service. It is used to -# 1) populate the docker/helm commands showed on portal -# 2) populate the token service URL returned to docker client -# -# Format: protocol://domain[:port]. Usually: -# 1) if "expose.type" is "ingress", the "domain" should be -# the value of "expose.ingress.hosts.core" -# 2) if "expose.type" is "clusterIP", the "domain" should be -# the value of "expose.clusterIP.name" -# 3) if "expose.type" is "nodePort", the "domain" should be -# the IP address of k8s node -# -# If Harbor is deployed behind the proxy, set it as the URL of proxy -externalURL: https://core.harbor.domain - -# The persistence is enabled by default and a default StorageClass -# is needed in the k8s cluster to provision volumes dynamically. -# Specify another StorageClass in the "storageClass" or set "existingClaim" -# if you already have existing persistent volumes to use -# -# For storing images and charts, you can also use "azure", "gcs", "s3", -# "swift" or "oss". Set it in the "imageChartStorage" section -persistence: - enabled: true - # Setting it to "keep" to avoid removing PVCs during a helm delete - # operation. Leaving it empty will delete PVCs after the chart deleted - # (this does not apply for PVCs that are created for internal database - # and redis components, i.e. they are never deleted automatically) - resourcePolicy: "keep" - persistentVolumeClaim: - registry: - # Use the existing PVC which must be created manually before bound, - # and specify the "subPath" if the PVC is shared with other components - existingClaim: "" - # Specify the "storageClass" used to provision the volume. Or the default - # StorageClass will be used (the default). - # Set it to "-" to disable dynamic provisioning - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - jobservice: - jobLog: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external database is used, the following settings for database will - # be ignored - database: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - # If external Redis is used, the following settings for Redis will - # be ignored - redis: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 1Gi - annotations: {} - trivy: - existingClaim: "" - storageClass: "" - subPath: "" - accessMode: ReadWriteOnce - size: 5Gi - annotations: {} - # Define which storage backend is used for registry to store - # images and charts. Refer to - # https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#storage - # for the detail. - imageChartStorage: - # Specify whether to disable `redirect` for images and chart storage, for - # backends which not supported it (such as using minio for `s3` storage type), please disable - # it. To disable redirects, simply set `disableredirect` to `true` instead. - # Refer to - # https://github.com/distribution/distribution/blob/main/docs/configuration.md#redirect - # for the detail. - disableredirect: false - # Specify the "caBundleSecretName" if the storage service uses a self-signed certificate. - # The secret must contain keys named "ca.crt" which will be injected into the trust store - # of registry's containers. - # caBundleSecretName: - - # Specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", - # "oss" and fill the information needed in the corresponding section. The type - # must be "filesystem" if you want to use persistent volumes for registry - type: filesystem - filesystem: - rootdirectory: /storage - #maxthreads: 100 - azure: - accountname: accountname - accountkey: base64encodedaccountkey - container: containername - #realm: core.windows.net - # To use existing secret, the key must be AZURE_STORAGE_ACCESS_KEY - existingSecret: "" - gcs: - bucket: bucketname - # The base64 encoded json file which contains the key - encodedkey: base64-encoded-json-key-file - #rootdirectory: /gcs/object/name/prefix - #chunksize: "5242880" - # To use existing secret, the key must be GCS_KEY_DATA - existingSecret: "" - useWorkloadIdentity: false - s3: - # Set an existing secret for S3 accesskey and secretkey - # keys in the secret should be REGISTRY_STORAGE_S3_ACCESSKEY and REGISTRY_STORAGE_S3_SECRETKEY for registry - #existingSecret: "" - region: us-west-1 - bucket: bucketname - #accesskey: awsaccesskey - #secretkey: awssecretkey - #regionendpoint: http://myobjects.local - #encrypt: false - #keyid: mykeyid - #secure: true - #skipverify: false - #v4auth: true - #chunksize: "5242880" - #rootdirectory: /s3/object/name/prefix - #storageclass: STANDARD - #multipartcopychunksize: "33554432" - #multipartcopymaxconcurrency: 100 - #multipartcopythresholdsize: "33554432" - swift: - authurl: https://storage.myprovider.com/v3/auth - username: username - password: password - container: containername - # keys in existing secret must be REGISTRY_STORAGE_SWIFT_PASSWORD, REGISTRY_STORAGE_SWIFT_SECRETKEY, REGISTRY_STORAGE_SWIFT_ACCESSKEY - existingSecret: "" - #region: fr - #tenant: tenantname - #tenantid: tenantid - #domain: domainname - #domainid: domainid - #trustid: trustid - #insecureskipverify: false - #chunksize: 5M - #prefix: - #secretkey: secretkey - #accesskey: accesskey - #authversion: 3 - #endpointtype: public - #tempurlcontainerkey: false - #tempurlmethods: - oss: - accesskeyid: accesskeyid - accesskeysecret: accesskeysecret - region: regionname - bucket: bucketname - # key in existingSecret must be REGISTRY_STORAGE_OSS_ACCESSKEYSECRET - existingSecret: "" - #endpoint: endpoint - #internal: false - #encrypt: false - #secure: true - #chunksize: 10M - #rootdirectory: rootdirectory - -# The initial password of Harbor admin. Change it from portal after launching Harbor -# or give an existing secret for it -# key in secret is given via (default to HARBOR_ADMIN_PASSWORD) -# existingSecretAdminPassword: -existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD -harborAdminPassword: "Harbor12345" - -# The internal TLS used for harbor components secure communicating. In order to enable https -# in each component tls cert files need to provided in advance. -internalTLS: - # If internal TLS enabled - enabled: false - # enable strong ssl ciphers (default: false) - strong_ssl_ciphers: false - # There are three ways to provide tls - # 1) "auto" will generate cert automatically - # 2) "manual" need provide cert file manually in following value - # 3) "secret" internal certificates from secret - certSource: "auto" - # The content of trust ca, only available when `certSource` is "manual" - trustCa: "" - # core related cert configuration - core: - # secret name for core's tls certs - secretName: "" - # Content of core's TLS cert file, only available when `certSource` is "manual" - crt: "" - # Content of core's TLS key file, only available when `certSource` is "manual" - key: "" - # jobservice related cert configuration - jobservice: - # secret name for jobservice's tls certs - secretName: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of jobservice's TLS key file, only available when `certSource` is "manual" - key: "" - # registry related cert configuration - registry: - # secret name for registry's tls certs - secretName: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of registry's TLS key file, only available when `certSource` is "manual" - key: "" - # portal related cert configuration - portal: - # secret name for portal's tls certs - secretName: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of portal's TLS key file, only available when `certSource` is "manual" - key: "" - # trivy related cert configuration - trivy: - # secret name for trivy's tls certs - secretName: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - crt: "" - # Content of trivy's TLS key file, only available when `certSource` is "manual" - key: "" - -ipFamily: - # ipv6Enabled set to true if ipv6 is enabled in cluster, currently it affected the nginx related component - ipv6: - enabled: true - # ipv4Enabled set to true if ipv4 is enabled in cluster, currently it affected the nginx related component - ipv4: - enabled: true - -imagePullPolicy: IfNotPresent - -# Use this set to assign a list of default pullSecrets -imagePullSecrets: -# - name: docker-registry-secret -# - name: internal-registry-secret - -# The update strategy for deployments with persistent volumes(jobservice, registry): "RollingUpdate" or "Recreate" -# Set it as "Recreate" when "RWM" for volumes isn't supported -updateStrategy: - type: RollingUpdate - -# debug, info, warning, error or fatal -logLevel: info - -# The name of the secret which contains key named "ca.crt". Setting this enables the -# download link on portal to download the CA certificate when the certificate isn't -# generated automatically -caSecretName: "" - -# The secret key used for encryption. Must be a string of 16 chars. -secretKey: "not-a-secure-key" -# If using existingSecretSecretKey, the key must be secretKey -existingSecretSecretKey: "" - -# The proxy settings for updating trivy vulnerabilities from the Internet and replicating -# artifacts from/to the registries that cannot be reached directly -proxy: - httpProxy: - httpsProxy: - noProxy: 127.0.0.1,localhost,.local,.internal - components: - - core - - jobservice - - trivy - -# Run the migration job via helm hook -enableMigrateHelmHook: false - -# The custom ca bundle secret, the secret must contain key named "ca.crt" -# which will be injected into the trust store for core, jobservice, registry, trivy components -# caBundleSecretName: "" - -## UAA Authentication Options -# If you're using UAA for authentication behind a self-signed -# certificate you will need to provide the CA Cert. -# Set uaaSecretName below to provide a pre-created secret that -# contains a base64 encoded CA Certificate named `ca.crt`. -# uaaSecretName: - -metrics: - enabled: false - core: - path: /metrics - port: 8001 - registry: - path: /metrics - port: 8001 - jobservice: - path: /metrics - port: 8001 - exporter: - path: /metrics - port: 8001 - ## Create prometheus serviceMonitor to scrape harbor metrics. - ## This requires the monitoring.coreos.com/v1 CRD. Please see - ## https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md - ## - serviceMonitor: - enabled: false - additionalLabels: {} - # Scrape interval. If not set, the Prometheus default scrape interval is used. - interval: "" - # Metric relabel configs to apply to samples before ingestion. - metricRelabelings: - [] - # - action: keep - # regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - # sourceLabels: [__name__] - # Relabel configs to apply to samples before ingestion. - relabelings: - [] - # - sourceLabels: [__meta_kubernetes_pod_node_name] - # separator: ; - # regex: ^(.*)$ - # targetLabel: nodename - # replacement: $1 - # action: replace - -trace: - enabled: false - # trace provider: jaeger or otel - # jaeger should be 1.26+ - provider: jaeger - # set sample_rate to 1 if you wanna sampling 100% of trace data; set 0.5 if you wanna sampling 50% of trace data, and so forth - sample_rate: 1 - # namespace used to differentiate different harbor services - # namespace: - # attributes is a key value dict contains user defined attributes used to initialize trace provider - # attributes: - # application: harbor - jaeger: - # jaeger supports two modes: - # collector mode(uncomment endpoint and uncomment username, password if needed) - # agent mode(uncomment agent_host and agent_port) - endpoint: http://hostname:14268/api/traces - # username: - # password: - # agent_host: hostname - # export trace data by jaeger.thrift in compact mode - # agent_port: 6831 - otel: - endpoint: hostname:4318 - url_path: /v1/traces - compression: false - insecure: true - # timeout is in seconds - timeout: 10 - -# cache layer configurations -# if this feature enabled, harbor will cache the resource -# `project/project_metadata/repository/artifact/manifest` in the redis -# which help to improve the performance of high concurrent pulling manifest. -cache: - # default is not enabled. - enabled: false - # default keep cache for one day. - expireHours: 24 - -## set Container Security Context to comply with PSP restricted policy if necessary -## each of the conatiner will apply the same security context -## containerSecurityContext:{} is initially an empty yaml that you could edit it on demand, we just filled with a common template for convenience -containerSecurityContext: - privileged: false - allowPrivilegeEscalation: false - seccompProfile: - type: RuntimeDefault - runAsNonRoot: true - capabilities: - drop: - - ALL - -# If service exposed via "ingress", the Nginx will not be used -nginx: - image: - repository: goharbor/nginx-photon - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - -portal: - image: - repository: goharbor/harbor-portal - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - -core: - image: - repository: goharbor/harbor-core - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - ## Startup probe values - startupProbe: - enabled: true - initialDelaySeconds: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## Additional service annotations - serviceAnnotations: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - ## User settings configuration json string - configureUserSettings: - # The provider for updating project quota(usage), there are 2 options, redis or db. - # By default it is implemented by db but you can configure it to redis which - # can improve the performance of high concurrent pushing to the same project, - # and reduce the database connections spike and occupies. - # Using redis will bring up some delay for quota usage updation for display, so only - # suggest switch provider to redis if you were ran into the db connections spike around - # the scenario of high concurrent pushing to same project, no improvment for other scenes. - quotaUpdateProvider: db # Or redis - # Secret is used when core server communicates with other components. - # If a secret key is not specified, Helm will generate one. Alternatively set existingSecret to use an existing secret - # Must be a string of 16 chars. - secret: "" - # Fill in the name of a kubernetes secret if you want to use your own - # If using existingSecret, the key must be secret - existingSecret: "" - # Fill the name of a kubernetes secret if you want to use your own - # TLS certificate and private key for token encryption/decryption. - # The secret must contain keys named: - # "tls.key" - the private key - # "tls.crt" - the certificate - secretName: "" - # If not specifying a preexisting secret, a secret can be created from tokenKey and tokenCert and used instead. - # If none of secretName, tokenKey, and tokenCert are specified, an ephemeral key and certificate will be autogenerated. - # tokenKey and tokenCert must BOTH be set or BOTH unset. - # The tokenKey value is formatted as a multiline string containing a PEM-encoded RSA key, indented one more than tokenKey on the following line. - tokenKey: | - # If tokenKey is set, the value of tokenCert must be set as a PEM-encoded certificate signed by tokenKey, and supplied as a multiline string, indented one more than tokenCert on the following line. - tokenCert: | - # The XSRF key. Will be generated automatically if it isn't specified - xsrfKey: "" - # If using existingSecret, the key is defined by core.existingXsrfSecretKey - existingXsrfSecret: "" - # If using existingSecret, the key - existingXsrfSecretKey: CSRF_KEY - # The time duration for async update artifact pull_time and repository - # pull_count, the unit is second. Will be 10 seconds if it isn't set. - # eg. artifactPullAsyncFlushDuration: 10 - artifactPullAsyncFlushDuration: - gdpr: - deleteUser: false - auditLogsCompliant: false - -jobservice: - image: - repository: goharbor/harbor-jobservice - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - maxJobWorkers: 10 - # The logger for jobs: "file", "database" or "stdout" - jobLoggers: - - file - # - database - # - stdout - # The jobLogger sweeper duration (ignored if `jobLogger` is `stdout`) - loggerSweeperDuration: 14 #days - notification: - webhook_job_max_retry: 3 - webhook_job_http_client_timeout: 3 # in seconds - reaper: - # the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24 - max_update_hours: 24 - # the max time for execution in running state without new task created - max_dangling_hours: 168 - # Secret is used when job service communicates with other components. - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the job service secret - existingSecretKey: JOBSERVICE_SECRET - -registry: - registry: - image: - repository: goharbor/registry-photon - tag: v2.11.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - controller: - image: - repository: goharbor/harbor-registryctl - tag: v2.11.1 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # Secret is used to secure the upload state from client - # and registry storage backend. - # See: https://github.com/distribution/distribution/blob/main/docs/configuration.md#http - # If a secret key is not specified, Helm will generate one. - # Must be a string of 16 chars. - secret: "" - # Use an existing secret resource - existingSecret: "" - # Key within the existing secret for the registry service secret - existingSecretKey: REGISTRY_HTTP_SECRET - # If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. - relativeurls: false - credentials: - username: "harbor_registry_user" - password: "harbor_registry_password" - # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD - existingSecret: "" - # Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt. - # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string - htpasswdString: "" - middleware: - enabled: false - type: cloudFront - cloudFront: - baseurl: example.cloudfront.net - keypairid: KEYPAIRID - duration: 3000s - ipfilteredby: none - # The secret key that should be present is CLOUDFRONT_KEY_DATA, which should be the encoded private key - # that allows access to CloudFront - privateKeySecret: "my-secret" - # enable purge _upload directories - upload_purging: - enabled: true - # remove files in _upload directories which exist for a period of time, default is one week. - age: 168h - # the interval of the purge operations - interval: 24h - dryrun: false - -trivy: - # enabled the flag to enable Trivy scanner - enabled: true - image: - # repository the repository for Trivy adapter image - repository: goharbor/trivy-adapter-photon - # tag the tag for Trivy adapter image - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # replicas the number of Pod replicas - replicas: 1 - resources: - requests: - cpu: 200m - memory: 512Mi - limits: - cpu: 1 - memory: 1Gi - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # debugMode the flag to enable Trivy debug mode with more verbose scanning log - debugMode: false - # vulnType a comma-separated list of vulnerability types. Possible values are `os` and `library`. - vulnType: "os,library" - # severity a comma-separated list of severities to be checked - severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - # ignoreUnfixed the flag to display only fixed vulnerabilities - ignoreUnfixed: false - # insecure the flag to skip verifying registry certificate - insecure: false - # gitHubToken the GitHub access token to download Trivy DB - # - # Trivy DB contains vulnerability information from NVD, Red Hat, and many other upstream vulnerability databases. - # It is downloaded by Trivy from the GitHub release page https://github.com/aquasecurity/trivy-db/releases and cached - # in the local file system (`/home/scanner/.cache/trivy/db/trivy.db`). In addition, the database contains the update - # timestamp so Trivy can detect whether it should download a newer version from the Internet or use the cached one. - # Currently, the database is updated every 12 hours and published as a new release to GitHub. - # - # Anonymous downloads from GitHub are subject to the limit of 60 requests per hour. Normally such rate limit is enough - # for production operations. If, for any reason, it's not enough, you could increase the rate limit to 5000 - # requests per hour by specifying the GitHub access token. For more details on GitHub rate limiting please consult - # https://developer.github.com/v3/#rate-limiting - # - # You can create a GitHub token by following the instructions in - # https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line - gitHubToken: "" - # skipUpdate the flag to disable Trivy DB downloads from GitHub - # - # You might want to set the value of this flag to `true` in test or CI/CD environments to avoid GitHub rate limiting issues. - # If the value is set to `true` you have to manually download the `trivy.db` file and mount it in the - # `/home/scanner/.cache/trivy/db/trivy.db` path. - skipUpdate: false - # skipJavaDBUpdate If the flag is enabled you have to manually download the `trivy-java.db` file and mount it in the - # `/home/scanner/.cache/trivy/java-db/trivy-java.db` path - # - skipJavaDBUpdate: false - # The offlineScan option prevents Trivy from sending API requests to identify dependencies. - # - # Scanning JAR files and pom.xml may require Internet access for better detection, but this option tries to avoid it. - # For example, the offline mode will not try to resolve transitive dependencies in pom.xml when the dependency doesn't - # exist in the local repositories. It means a number of detected vulnerabilities might be fewer in offline mode. - # It would work if all the dependencies are in local. - # This option doesn’t affect DB download. You need to specify skipUpdate as well as offlineScan in an air-gapped environment. - offlineScan: false - # Comma-separated list of what security issues to detect. Possible values are `vuln`, `config` and `secret`. Defaults to `vuln`. - securityCheck: "vuln" - # The duration to wait for scan completion - timeout: 5m0s - -database: - # if external database is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - image: - repository: goharbor/harbor-db - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - # The timeout used in livenessProbe; 1 to 5 seconds - livenessProbe: - timeoutSeconds: 1 - # The timeout used in readinessProbe; 1 to 5 seconds - readinessProbe: - timeoutSeconds: 1 - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - extrInitContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # The initial superuser password for internal database - password: "changeit" - # The size limit for Shared memory, pgSQL use it for shared_buffer - # More details see: - # https://github.com/goharbor/harbor/issues/15034 - shmSizeLimit: 512Mi - initContainer: - migrator: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - permissions: {} - # resources: - # requests: - # memory: 128Mi - # cpu: 100m - external: - host: "192.168.0.1" - port: "5432" - username: "user" - password: "password" - coreDatabase: "registry" - # if using existing secret, the key must be "password" - existingSecret: "" - # "disable" - No SSL - # "require" - Always SSL (skip verification) - # "verify-ca" - Always SSL (verify that the certificate presented by the - # server was signed by a trusted CA) - # "verify-full" - Always SSL (verify that the certification presented by the - # server was signed by a trusted CA and the server host name matches the one - # in the certificate) - sslmode: "disable" - # The maximum number of connections in the idle connection pool per pod (core+exporter). - # If it <=0, no idle connections are retained. - maxIdleConns: 100 - # The maximum number of open connections to the database per pod (core+exporter). - # If it <= 0, then there is no limit on the number of open connections. - # Note: the default number of connections is 1024 for harbor's postgres. - maxOpenConns: 900 - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -redis: - # if external Redis is used, set "type" to "external" - # and fill the connection information in "external" section - type: internal - internal: - image: - repository: goharbor/redis-photon - tag: v2.11.1 - # set the service account to be used, default if left empty - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - nodeSelector: {} - tolerations: [] - affinity: {} - ## The priority class to run the pod as - priorityClassName: - # containers to be run before the controller's container starts. - initContainers: [] - # Example: - # - # - name: wait - # image: busybox - # command: [ 'sh', '-c', "sleep 20" ] - # # jobserviceDatabaseIndex defaults to "1" - # # registryDatabaseIndex defaults to "2" - # # trivyAdapterIndex defaults to "5" - # # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - external: - # support redis, redis+sentinel - # addr for redis: : - # addr for redis+sentinel: :,:,: - addr: "192.168.0.2:6379" - # The name of the set of Redis instances to monitor, it must be set to support redis+sentinel - sentinelMasterSet: "" - # The "coreDatabaseIndex" must be "0" as the library Harbor - # used doesn't support configuring it - # harborDatabaseIndex defaults to "0", but it can be configured to "6", this config is optional - # cacheLayerDatabaseIndex defaults to "0", but it can be configured to "7", this config is optional - coreDatabaseIndex: "0" - jobserviceDatabaseIndex: "1" - registryDatabaseIndex: "2" - trivyAdapterIndex: "5" - # harborDatabaseIndex: "6" - # cacheLayerDatabaseIndex: "7" - # username field can be an empty string, and it will be authenticated against the default user - username: "" - password: "" - # If using existingSecret, the key must be REDIS_PASSWORD - existingSecret: "" - ## Additional deployment annotations - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - -exporter: - image: - repository: goharbor/harbor-exporter - tag: v2.11.1 - serviceAccountName: "" - # mount the service account token - automountServiceAccountToken: false - replicas: 1 - revisionHistoryLimit: 10 - # resources: - # requests: - # memory: 256Mi - # cpu: 100m - extraEnvVars: [] - podAnnotations: {} - ## Additional deployment labels - podLabels: {} - nodeSelector: {} - tolerations: [] - affinity: {} - # Spread Pods across failure-domains like regions, availability zones or nodes - topologySpreadConstraints: [] - ## The priority class to run the pod as - priorityClassName: - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # nodeTaintsPolicy: Honor - # whenUnsatisfiable: DoNotSchedule - cacheDuration: 23 - cacheCleanInterval: 14400 diff --git a/index.yaml b/index.yaml index f067febf8c..6d93ff6951 100644 --- a/index.yaml +++ b/index.yaml @@ -14296,291 +14296,6 @@ entries: urls: - assets/haproxy/haproxy-1.30.6.tgz version: 1.30.6 - harbor: - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.11.1 - created: "2024-08-28T00:50:02.242057739Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: 83dac260d5c8a6fbfee9b767fb6802a266e726abb4d21374e75f24728703c362 - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - kubeVersion: '>=1.20-0' - maintainers: - - email: yan-yw.wang@broadcom.com - name: Yan Wang - - email: wenkai.yin@broadcom.com - name: Wenkai Yin - - email: miner.yang@broadcom.com - name: Miner Yang - - email: shengwen.yu@broadcom.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.15.1.tgz - version: 1.15.1 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.11.0 - created: "2024-07-02T21:23:47.67606149Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: 7ca26fd1032b714c5c8d7536118773a7ff54c6a697c26558f59fbf601745485c - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yan-yw.wang@broadcom.com - name: Yan Wang - - email: wenkai.yin@broadcom.com - name: Wenkai Yin - - email: miner.yang@broadcom.com - name: Miner Yang - - email: shengwen.yu@broadcom.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.15.0.tgz - version: 1.15.0 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.10.2 - created: "2024-04-16T10:50:02.108616258-06:00" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: a9329e3293698e66f3d2c11fb43c912ff49d9f676ca0fcdac7bbd195983e36cd - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.14.2.tgz - version: 1.14.2 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.10.1 - created: "2024-03-25T14:58:48.30730098-06:00" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: 41f03baea13a8dea1580e139ee1c4d84d287ebcf8a428eaee6db03d6c5dc8465 - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.14.1.tgz - version: 1.14.1 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.10.0 - created: "2024-01-12T17:06:36.516898981Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: a8c133cb426df2b34fa7fcbd0d2421d7585dfa209a32c044cd3bf0151f3f65c6 - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.14.0.tgz - version: 1.14.0 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.9.1 - created: "2023-11-06T14:43:21.949940903Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: c551836ec1d6c09facb76facd084b98b9980e194ecf67e9c361c0ae5c50cf63b - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.13.1.tgz - version: 1.13.1 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.9.0 - created: "2023-08-30T19:39:38.008119843Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: 67e02a766502d6227e91fcf93b046df7ab63e9ba3e52da3f4c0791e621d91721 - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.13.0.tgz - version: 1.13.0 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.8.4 - created: "2023-08-16T17:41:11.974069402Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: 335438a14e54751c09bd7cb74e8b53836084460c4a073b7d1e1d53441cab0eed - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.12.4.tgz - version: 1.12.4 - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/display-name: Harbor - catalog.cattle.io/kube-version: '>=1.20-0' - catalog.cattle.io/release-name: harbor - apiVersion: v1 - appVersion: 2.8.3 - created: "2023-07-31T11:43:57.005175212Z" - description: An open source trusted cloud native registry that stores, signs, - and scans content - digest: a4d5e23e91bae991107635ac5faf6226f56f96bee6eee7ace33286ff096ca134 - home: https://goharbor.io - icon: file://assets/icons/harbor.png - keywords: - - docker - - registry - - harbor - maintainers: - - email: yinw@vmware.com - name: Wenkai Yin - - email: hweiwei@vmware.com - name: Weiwei He - - email: yshengwen@vmware.com - name: Shengwen Yu - name: harbor - sources: - - https://github.com/goharbor/harbor - - https://github.com/goharbor/harbor-helm - urls: - - assets/harbor/harbor-1.12.3.tgz - version: 1.12.3 hpe-array-exporter: - annotations: artifacthub.io/category: storage diff --git a/packages/harbor/harbor/upstream.yaml b/packages/harbor/harbor/upstream.yaml deleted file mode 100644 index 003e057136..0000000000 --- a/packages/harbor/harbor/upstream.yaml +++ /dev/null @@ -1,6 +0,0 @@ -HelmRepo: https://helm.goharbor.io -HelmChart: harbor -Vendor: Harbor -DisplayName: Harbor -ChartMetadata: - kubeVersion: '>=1.20-0'