From d2a26929df9fb1dc2b2a94f6e768f11c180dc959 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 22 Dec 2022 05:23:54 +0100 Subject: [PATCH] Correction of ssl and changed environments after upgrading. --- harbor/common/config/core/env | 10 +++++----- harbor/common/config/jobservice/env | 8 ++++---- harbor/common/config/registry/passwd | 2 +- harbor/common/config/registryctl/env | 4 ++-- harbor/common/config/trivy-adapter/env | 2 +- harbor/docker-compose.yml | 1 - 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/harbor/common/config/core/env b/harbor/common/config/core/env index 823f156..dca40e9 100644 --- a/harbor/common/config/core/env +++ b/harbor/common/config/core/env @@ -21,8 +21,8 @@ PORTAL_URL=http://portal:8080 TOKEN_SERVICE_URL=http://core:8080/service/token HARBOR_ADMIN_PASSWORD=j2Q2gRX@zpGYGsUZwJ@ynvnU3gw6Y* MAX_JOB_WORKERS=10 -CORE_SECRET=2WyVPYUlCIRDPCv2 -JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 +CORE_SECRET=krGpB3TQ5AgYcjOn +JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3 WITH_NOTARY=False WITH_TRIVY=True CORE_URL=http://core:8080 @@ -37,13 +37,13 @@ CHART_REPOSITORY_URL=http://chartmuseum:9999 REGISTRY_CONTROLLER_URL=http://registryctl:8080 WITH_CHARTMUSEUM=False REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user -REGISTRY_CREDENTIAL_PASSWORD=RvC6BuQM4kFianaQ81mMxGuDHdNEQ5Yp -CSRF_KEY=hPD1uJIjELdXLCH2Z6zFWS6JDT0JGRHc +REGISTRY_CREDENTIAL_PASSWORD=Jv2MbRB4lfPbxDo4cJQCfxg3kcok64FT +CSRF_KEY=gvqZb6yOzECdq3dU7YQBfnU5AZMcooRJ PERMITTED_REGISTRY_TYPES_FOR_PROXY_CACHE=docker-hub,harbor,azure-acr,aws-ecr,google-gcr,quay,docker-registry,github-ghcr HTTP_PROXY= HTTPS_PROXY= -NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server +NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl PORT=8080 diff --git a/harbor/common/config/jobservice/env b/harbor/common/config/jobservice/env index 120d97c..50f8495 100644 --- a/harbor/common/config/jobservice/env +++ b/harbor/common/config/jobservice/env @@ -1,6 +1,6 @@ -CORE_SECRET=2WyVPYUlCIRDPCv2 +CORE_SECRET=krGpB3TQ5AgYcjOn REGISTRY_URL=http://registry:5000 -JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 +JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3 CORE_URL=http://core:8080 REGISTRY_CONTROLLER_URL=http://registryctl:8080 JOBSERVICE_WEBHOOK_JOB_MAX_RETRY=10 @@ -8,9 +8,9 @@ JOBSERVICE_WEBHOOK_JOB_MAX_RETRY=10 HTTP_PROXY= HTTPS_PROXY= -NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server +NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl REGISTRY_CREDENTIAL_USERNAME=harbor_registry_user -REGISTRY_CREDENTIAL_PASSWORD=RvC6BuQM4kFianaQ81mMxGuDHdNEQ5Yp +REGISTRY_CREDENTIAL_PASSWORD=Jv2MbRB4lfPbxDo4cJQCfxg3kcok64FT diff --git a/harbor/common/config/registry/passwd b/harbor/common/config/registry/passwd index 6c0eee4..e214455 100644 --- a/harbor/common/config/registry/passwd +++ b/harbor/common/config/registry/passwd @@ -1 +1 @@ -harbor_registry_user:$2y$05$paAwVLgr1maxYnL9fud8q.u7SiU/75K/ra2aeEcYNJt22ro/st4qe +harbor_registry_user:$2y$05$.N3TFhxdJ5K5OMhNf491Y.bLVsJb4OXRivmx/AMsYFbkRzmXi8QO2 diff --git a/harbor/common/config/registryctl/env b/harbor/common/config/registryctl/env index 1464b62..d083f3f 100644 --- a/harbor/common/config/registryctl/env +++ b/harbor/common/config/registryctl/env @@ -1,2 +1,2 @@ -CORE_SECRET=2WyVPYUlCIRDPCv2 -JOBSERVICE_SECRET=a1XRgtkNICmX2Gl4 +CORE_SECRET=krGpB3TQ5AgYcjOn +JOBSERVICE_SECRET=vh9rj0lY4mqPvdn3 diff --git a/harbor/common/config/trivy-adapter/env b/harbor/common/config/trivy-adapter/env index df41a14..b28cb83 100644 --- a/harbor/common/config/trivy-adapter/env +++ b/harbor/common/config/trivy-adapter/env @@ -16,4 +16,4 @@ SCANNER_TRIVY_INSECURE=False SCANNER_TRIVY_TIMEOUT=5m0s HTTP_PROXY= HTTPS_PROXY= -NO_PROXY=localhost,log,.internal,exporter,db,.local,portal,redis,127.0.0.1,registryctl,nginx,core,jobservice,chartmuseum,notary-signer,trivy-adapter,registry,postgresql,notary-server +NO_PROXY=postgresql,core,chartmuseum,.internal,redis,log,127.0.0.1,exporter,portal,notary-signer,registry,notary-server,db,nginx,jobservice,localhost,trivy-adapter,.local,registryctl diff --git a/harbor/docker-compose.yml b/harbor/docker-compose.yml index c3913ad..55a9046 100644 --- a/harbor/docker-compose.yml +++ b/harbor/docker-compose.yml @@ -261,7 +261,6 @@ services: - "traefik.http.routers.harbor-secure.service=harbor-secure" - "traefik.http.routers.harbor-secure.tls=true" - "traefik.http.routers.harbor-secure.tls.certresolver=myresolver" - - "traefik.http.routers.harbor-secure.tls.domains[0].main=cs-registry.ddnss.de" - "traefik.http.services.harbor-secure.loadbalancer.server.port=8080" trivy-adapter: