diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-core.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-core.yaml index dc4b45ac1..410b0a4a9 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-core.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-core.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: app.conf: | appname = Harbor diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-exporter-env.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-exporter-env.yaml index ac517fe5c..09ef8e89c 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-exporter-env.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-exporter-env.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: HTTP_PROXY: "" HTTPS_PROXY: "" diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-env.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-env.yaml index a27bff9a3..3c7f2c77c 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-env.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-env.yaml @@ -12,13 +12,14 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: CORE_URL: "http://harbor-core:80" TOKEN_SERVICE_URL: "http://harbor-core:80/service/token" REGISTRY_URL: "http://harbor-registry:5000" REGISTRY_CONTROLLER_URL: "http://harbor-registry:8080" REGISTRY_CREDENTIAL_USERNAME: "harbor_registry_user" + REGISTRY_HTTP_CLIENT_TIMEOUT: "30" JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "3" JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "3" LOG_LEVEL: "info" diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice.yaml index fc59f1c67..1c5ad5a53 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: config.yml: | #Server listening port diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-portal.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-portal.yaml index 6ff264164..6915eefbc 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-portal.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-portal.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: nginx.conf: | worker_processes auto; diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registry.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registry.yaml index 43587f0ea..09b4b1efb 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registry.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registry.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: config.yml: | version: 0.1 @@ -38,6 +38,8 @@ data: redis: addr: harbor-valkey.harbor:6379 db: 2 + username: "" + password: "" readtimeout: 10s writetimeout: 10s dialtimeout: 10s diff --git a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registryctl.yaml b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registryctl.yaml index f5538a114..04d96d04a 100644 --- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registryctl.yaml +++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-registryctl.yaml @@ -12,5 +12,5 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" data: diff --git a/clusters/cl01tl/manifests/harbor/Deployment-harbor-core.yaml b/clusters/cl01tl/manifests/harbor/Deployment-harbor-core.yaml index 16910b54c..2355ebeb2 100644 --- a/clusters/cl01tl/manifests/harbor/Deployment-harbor-core.yaml +++ b/clusters/cl01tl/manifests/harbor/Deployment-harbor-core.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: core app.kubernetes.io/component: core spec: @@ -34,13 +34,13 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: core app.kubernetes.io/component: core annotations: - checksum/configmap: 641bbb72f9900d6197857c2f9fb6f0bdc95af2a2e3883dfec940c519b299da5d - checksum/secret: 59669814fb7baa809e9428f8ded55a9bf9281f6bfedaa638b53b49cff7b66e22 - checksum/secret-jobservice: f3a0135630d8fa98235c6c6341ee8e42262bad005727f86ce3f0a0679271f1ed + checksum/configmap: 3a3a6fd7af975efc25037ad550cb4d2cf4ce9f4578a7833e1b9186631fcb7675 + checksum/secret: 7d184289f51bc7b1001e976c80693ff24befaa3ccfb2146ab9c4051b61ae385d + checksum/secret-jobservice: 388df16a5ce670284aaa57126ada65df238ddadbad14c5aaa94a384592da2e7d spec: securityContext: runAsUser: 10000 @@ -56,23 +56,31 @@ spec: path: /api/v2.0/ping scheme: HTTP port: 8080 - failureThreshold: 360 initialDelaySeconds: 10 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 360 + successThreshold: 1 livenessProbe: httpGet: path: /api/v2.0/ping scheme: HTTP port: 8080 - failureThreshold: 2 + initialDelaySeconds: 0 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 2 + successThreshold: 1 readinessProbe: httpGet: path: /api/v2.0/ping scheme: HTTP port: 8080 - failureThreshold: 2 + initialDelaySeconds: 0 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 2 + successThreshold: 1 envFrom: - configMapRef: name: "harbor-core" diff --git a/clusters/cl01tl/manifests/harbor/Deployment-harbor-exporter.yaml b/clusters/cl01tl/manifests/harbor/Deployment-harbor-exporter.yaml index 41b55e5cd..bb3228d2d 100644 --- a/clusters/cl01tl/manifests/harbor/Deployment-harbor-exporter.yaml +++ b/clusters/cl01tl/manifests/harbor/Deployment-harbor-exporter.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: exporter app.kubernetes.io/component: exporter spec: @@ -34,12 +34,12 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: exporter app.kubernetes.io/component: exporter annotations: - checksum/configmap: 5293f455659091cb2f6ed1113095a6dbb04f8364748670cb5d4630ca689d73d8 - checksum/secret: bb03df1fde79526e9aaa86ec987c17ba77e4b5cbeb4ff140100971d53b061347 + checksum/configmap: 7372b983a0a8b4f12b5b575ae3ea42a3669d01e3ed5d686d06b2158efb15e6fa + checksum/secret: 13d97bf97fd83b77a4d56b8e57acad70773ef1536f9c7a48cf7be1c8b7d13b2c spec: securityContext: runAsUser: 10000 @@ -55,12 +55,18 @@ spec: port: 8001 initialDelaySeconds: 300 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 readinessProbe: httpGet: path: / port: 8001 initialDelaySeconds: 30 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 args: ["-log-level", "info"] envFrom: - configMapRef: diff --git a/clusters/cl01tl/manifests/harbor/Deployment-harbor-jobservice.yaml b/clusters/cl01tl/manifests/harbor/Deployment-harbor-jobservice.yaml index 316f71c92..49432f7bb 100644 --- a/clusters/cl01tl/manifests/harbor/Deployment-harbor-jobservice.yaml +++ b/clusters/cl01tl/manifests/harbor/Deployment-harbor-jobservice.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: jobservice app.kubernetes.io/component: jobservice spec: @@ -37,14 +37,14 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: jobservice app.kubernetes.io/component: jobservice annotations: - checksum/configmap: fd35a180d4111bc06151e7a8a1b824387e09f2aae58e69ecea24f8540abaebbd - checksum/configmap-env: e01b3437c4423c0fbcfcb609680c3186f3a09d00297883f6b19f117a44d2a88c - checksum/secret: f3a0135630d8fa98235c6c6341ee8e42262bad005727f86ce3f0a0679271f1ed - checksum/secret-core: 59669814fb7baa809e9428f8ded55a9bf9281f6bfedaa638b53b49cff7b66e22 + checksum/configmap: c2e3acfc6b31142f56cc1bd707f88de87d958699fa1e249938969caacea88422 + checksum/configmap-env: 0e296f95cba8dcfaade3244867012fda805351519d0b7e05982b482304838439 + checksum/secret: 388df16a5ce670284aaa57126ada65df238ddadbad14c5aaa94a384592da2e7d + checksum/secret-core: 7d184289f51bc7b1001e976c80693ff24befaa3ccfb2146ab9c4051b61ae385d spec: securityContext: runAsUser: 10000 @@ -62,6 +62,9 @@ spec: port: 8080 initialDelaySeconds: 300 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 readinessProbe: httpGet: path: /api/v1/stats @@ -69,6 +72,9 @@ spec: port: 8080 initialDelaySeconds: 20 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 env: - name: CORE_SECRET valueFrom: diff --git a/clusters/cl01tl/manifests/harbor/Deployment-harbor-portal.yaml b/clusters/cl01tl/manifests/harbor/Deployment-harbor-portal.yaml index 18dc3e25d..c0a8c5cfe 100644 --- a/clusters/cl01tl/manifests/harbor/Deployment-harbor-portal.yaml +++ b/clusters/cl01tl/manifests/harbor/Deployment-harbor-portal.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: portal app.kubernetes.io/component: portal spec: @@ -34,11 +34,11 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: portal app.kubernetes.io/component: portal annotations: - checksum/configmap: 67a5d24a4be2482eaeeeb0b460a525257bcc917634227bef22888ba007496c12 + checksum/configmap: ac3500199b3dbf96a8549550fa6466a04efb316fdedf03997b574152c6f3a096 spec: securityContext: runAsUser: 10000 @@ -64,6 +64,9 @@ spec: port: 8080 initialDelaySeconds: 300 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 readinessProbe: httpGet: path: / @@ -71,6 +74,9 @@ spec: port: 8080 initialDelaySeconds: 1 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 ports: - containerPort: 8080 volumeMounts: diff --git a/clusters/cl01tl/manifests/harbor/Deployment-harbor-registry.yaml b/clusters/cl01tl/manifests/harbor/Deployment-harbor-registry.yaml index f8939fae2..6af17820c 100644 --- a/clusters/cl01tl/manifests/harbor/Deployment-harbor-registry.yaml +++ b/clusters/cl01tl/manifests/harbor/Deployment-harbor-registry.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: registry app.kubernetes.io/component: registry spec: @@ -37,14 +37,14 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: registry app.kubernetes.io/component: registry annotations: - checksum/configmap: 77823f5f18ace686e7928407a3f045ee24ae0a3bd616a88a110e4a504b03f7ca - checksum/secret: 47a7c4b7d3c8e57c96d426d6085e3d3c9dfed0b5590c1c5a46f3ea642e876775 - checksum/secret-jobservice: f3a0135630d8fa98235c6c6341ee8e42262bad005727f86ce3f0a0679271f1ed - checksum/secret-core: 59669814fb7baa809e9428f8ded55a9bf9281f6bfedaa638b53b49cff7b66e22 + checksum/configmap: 2e9fbee4c76df88822f47066eb1e8c02cec9917d54a619344512e042d1aba13b + checksum/secret: 0e6f4d074dceb03e699f84fb97a8bb6f2eb9968ee89396d3b9fe56c965d2e5b3 + checksum/secret-jobservice: 388df16a5ce670284aaa57126ada65df238ddadbad14c5aaa94a384592da2e7d + checksum/secret-core: 7d184289f51bc7b1001e976c80693ff24befaa3ccfb2146ab9c4051b61ae385d spec: securityContext: runAsUser: 10000 @@ -63,6 +63,9 @@ spec: port: 5000 initialDelaySeconds: 300 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 readinessProbe: httpGet: path: / @@ -70,6 +73,9 @@ spec: port: 5000 initialDelaySeconds: 1 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 securityContext: allowPrivilegeEscalation: false capabilities: @@ -111,6 +117,9 @@ spec: port: 8080 initialDelaySeconds: 300 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 readinessProbe: httpGet: path: /api/health @@ -118,6 +127,9 @@ spec: port: 8080 initialDelaySeconds: 1 periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/clusters/cl01tl/manifests/harbor/HTTPRoute-harbor-route.yaml b/clusters/cl01tl/manifests/harbor/HTTPRoute-harbor-route.yaml index 8fe170bc0..76d507999 100644 --- a/clusters/cl01tl/manifests/harbor/HTTPRoute-harbor-route.yaml +++ b/clusters/cl01tl/manifests/harbor/HTTPRoute-harbor-route.yaml @@ -28,6 +28,9 @@ spec: backendRefs: - name: harbor-core namespace: "harbor" + group: "" + kind: Service + weight: 1 port: 80 - matches: - path: @@ -36,4 +39,7 @@ spec: backendRefs: - name: harbor-portal namespace: "harbor" + group: "" + kind: Service + weight: 1 port: 80 diff --git a/clusters/cl01tl/manifests/harbor/Job-migration-job.yaml b/clusters/cl01tl/manifests/harbor/Job-migration-job.yaml index 89499594d..d4c24e84f 100644 --- a/clusters/cl01tl/manifests/harbor/Job-migration-job.yaml +++ b/clusters/cl01tl/manifests/harbor/Job-migration-job.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: migrator annotations: "helm.sh/hook": pre-upgrade diff --git a/clusters/cl01tl/manifests/harbor/PersistentVolumeClaim-harbor-registry.yaml b/clusters/cl01tl/manifests/harbor/PersistentVolumeClaim-harbor-registry.yaml index 5441f355b..5617254a5 100644 --- a/clusters/cl01tl/manifests/harbor/PersistentVolumeClaim-harbor-registry.yaml +++ b/clusters/cl01tl/manifests/harbor/PersistentVolumeClaim-harbor-registry.yaml @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: registry app.kubernetes.io/component: registry spec: diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-core.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-core.yaml index 5210357a5..0c14fa3f6 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-core.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-core.yaml @@ -12,6 +12,6 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-exporter.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-exporter.yaml index 9f9b8389d..7c15126b4 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-exporter.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-exporter.yaml @@ -12,6 +12,6 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-jobservice.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-jobservice.yaml index aa4daa692..3135fa35c 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-jobservice.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-jobservice.yaml @@ -12,6 +12,6 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-registry.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-registry.yaml index 2df0b1c11..4c43e2422 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-registry.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-registry.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: REGISTRY_REDIS_PASSWORD: "" diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-registryctl.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-registryctl.yaml index f8a539754..daadf61bb 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-registryctl.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-registryctl.yaml @@ -12,6 +12,6 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: diff --git a/clusters/cl01tl/manifests/harbor/Secret-harbor-trivy.yaml b/clusters/cl01tl/manifests/harbor/Secret-harbor-trivy.yaml index 68bf1dbb2..9ca013301 100644 --- a/clusters/cl01tl/manifests/harbor/Secret-harbor-trivy.yaml +++ b/clusters/cl01tl/manifests/harbor/Secret-harbor-trivy.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" type: Opaque data: redisURL: cmVkaXM6Ly9oYXJib3ItdmFsa2V5LmhhcmJvcjo2Mzc5LzU/aWRsZV90aW1lb3V0X3NlY29uZHM9MzA= diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-core.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-core.yaml index b2363f693..19958d475 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-core.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-core.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - name: http-web diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-exporter.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-exporter.yaml index 9d37b52c7..859f962e8 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-exporter.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-exporter.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - name: http-metrics diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-jobservice.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-jobservice.yaml index dfcf49440..1ec2ed6e2 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-jobservice.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-jobservice.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - name: http-jobservice diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-portal.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-portal.yaml index 5ac7443e2..b63f33e7e 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-portal.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-portal.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - port: 80 diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-registry.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-registry.yaml index 358f8deaa..7122a00a0 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-registry.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-registry.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - name: http-registry diff --git a/clusters/cl01tl/manifests/harbor/Service-harbor-trivy.yaml b/clusters/cl01tl/manifests/harbor/Service-harbor-trivy.yaml index 2b75dcef9..1e407e5a4 100644 --- a/clusters/cl01tl/manifests/harbor/Service-harbor-trivy.yaml +++ b/clusters/cl01tl/manifests/harbor/Service-harbor-trivy.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: ports: - name: http-trivy diff --git a/clusters/cl01tl/manifests/harbor/ServiceMonitor-harbor.yaml b/clusters/cl01tl/manifests/harbor/ServiceMonitor-harbor.yaml index 4f888a7ee..720d64460 100644 --- a/clusters/cl01tl/manifests/harbor/ServiceMonitor-harbor.yaml +++ b/clusters/cl01tl/manifests/harbor/ServiceMonitor-harbor.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" spec: jobLabel: app.kubernetes.io/name endpoints: diff --git a/clusters/cl01tl/manifests/harbor/StatefulSet-harbor-trivy.yaml b/clusters/cl01tl/manifests/harbor/StatefulSet-harbor-trivy.yaml index 459b91f72..ca19caad2 100644 --- a/clusters/cl01tl/manifests/harbor/StatefulSet-harbor-trivy.yaml +++ b/clusters/cl01tl/manifests/harbor/StatefulSet-harbor-trivy.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: trivy app.kubernetes.io/component: trivy spec: @@ -34,11 +34,11 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.14.3" + app.kubernetes.io/version: "2.15.0" component: trivy app.kubernetes.io/component: trivy annotations: - checksum/secret: 83fe4ce46bcdf24dffaccbf9ece506a58ee9eda2fe07e0aa3658386702fd3d26 + checksum/secret: a5d88861174c66ea8756756d591713c04dccb4a2d452cf81d4666281915bbf62 spec: securityContext: runAsUser: 10000 @@ -131,8 +131,9 @@ spec: port: api-server initialDelaySeconds: 5 periodSeconds: 10 - successThreshold: 1 + timeoutSeconds: 1 failureThreshold: 10 + successThreshold: 1 readinessProbe: httpGet: scheme: HTTP @@ -140,8 +141,9 @@ spec: port: api-server initialDelaySeconds: 5 periodSeconds: 10 - successThreshold: 1 + timeoutSeconds: 1 failureThreshold: 3 + successThreshold: 1 resources: limits: cpu: 1