Merge pull request 'Automated Manifest Update - Automerge' (#3517) from auto/update-manifests-automerge-20260126100527 into manifests

2026-01-26 10:06:03 +00:00
parent 4b21ad32eb 615cfd299e
commit 97a207fb15
28 changed files with 50 additions and 50 deletions
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  app.conf: |
    appname = Harbor
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  HTTP_PROXY: ""
  HTTPS_PROXY: ""
--- a/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-env.yaml
+++ b/clusters/cl01tl/manifests/harbor/ConfigMap-harbor-jobservice-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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  CORE_URL: "http://harbor-core:80"
  TOKEN_SERVICE_URL: "http://harbor-core:80/service/token"
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  config.yml: |
    #Server listening port
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  nginx.conf: |
    worker_processes auto;
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
  config.yml: |
    version: 0.1
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 data:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: core
        app.kubernetes.io/component: core
      annotations:
-        checksum/configmap: 22c000cacb7ed5c6148f6283be6886b638aebd98c4ec5e0f175cb15e9829fb3c
-        checksum/secret: dbbc4f9b641d5b6b473a87b69999060d2170fad45fd7ab44e30f8d142ff90a65
-        checksum/secret-jobservice: d95a9b319aea3eeedf845e1a2478d7d8a449307132d66f0f8d23417ef0d5c6e5
+        checksum/configmap: fc81233666d101bbd9d2cb96796ecf0dcb1badfaca0fa71238b65c05ac9cc71f
+        checksum/secret: ea96175d9d13685272268c622197e7f602ef7f436c55dafd8e625f468586290d
+        checksum/secret-jobservice: d997909ea151f04cd3c6ce0da2b1e4b09ab6eecdc3d048c0d3aedf21b23285ba
    spec:
      securityContext:
        runAsUser: 10000
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: exporter
        app.kubernetes.io/component: exporter
      annotations:
-        checksum/configmap: f419f27c185ed4bb0753753b655c3924c1dc3f909898ac1d692f49be89942fcd
-        checksum/secret: 9b7d7b9811e8100b8a6960e9bfec53248561025b235858a581824762fe5b0fdf
+        checksum/configmap: 20d7a4e0e881e012308448465114462b7e6d6a1df6f6860b308a279f8815ea08
+        checksum/secret: 8905c1701a3ab4bcddb0c66b5428b18255fa8d3f4d1ff790897c401abd04485f
    spec:
      securityContext:
        runAsUser: 10000
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: jobservice
        app.kubernetes.io/component: jobservice
      annotations:
-        checksum/configmap: 78f0d005dc7513b1739b03e710a707c085c37d63a913bf6bb81f39e1c0c5ed45
-        checksum/configmap-env: 7b2e43dd65659a8ea222ef2a2ce88cb96c7b665e56f1cbba8ea2c2c0e29b5fc0
-        checksum/secret: d95a9b319aea3eeedf845e1a2478d7d8a449307132d66f0f8d23417ef0d5c6e5
-        checksum/secret-core: dbbc4f9b641d5b6b473a87b69999060d2170fad45fd7ab44e30f8d142ff90a65
+        checksum/configmap: 5ca4ab1b168eaf25d971fa6d3cda24f9631a74065926b9760d79d0e19589886f
+        checksum/configmap-env: 6bc09dbefdd38703b3b4a150ac23b43ebfc6b8d5a77e61983a8c68a3588d02bf
+        checksum/secret: d997909ea151f04cd3c6ce0da2b1e4b09ab6eecdc3d048c0d3aedf21b23285ba
+        checksum/secret-core: ea96175d9d13685272268c622197e7f602ef7f436c55dafd8e625f468586290d
    spec:
      securityContext:
        runAsUser: 10000
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: portal
        app.kubernetes.io/component: portal
      annotations:
-        checksum/configmap: 2c387ee9ead7158b790062d71e7e21faf5dff876522197d7c5a652d47582da28
+        checksum/configmap: c5a352b51b1e4ca91935bfbccfbd62b94d18bc6ac132bcec6ae03d78cdb3a6f2
    spec:
      securityContext:
        runAsUser: 10000
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: registry
        app.kubernetes.io/component: registry
      annotations:
-        checksum/configmap: ea0a87ec093ac4c9193837471a658b65e79ace6dc5effa7c6f4ed2acbc50edfa
-        checksum/secret: d887f55e14af10395e0a036bf5a10afcac01a0e25bced48459bb11c1888bd697
-        checksum/secret-jobservice: d95a9b319aea3eeedf845e1a2478d7d8a449307132d66f0f8d23417ef0d5c6e5
-        checksum/secret-core: dbbc4f9b641d5b6b473a87b69999060d2170fad45fd7ab44e30f8d142ff90a65
+        checksum/configmap: 09248f8f683f624ab07d08786a9f8aaa38d03fa22c6b81d4ad32c3ddf25509ec
+        checksum/secret: 532881bd1d1d6c57ab80f3b04a516655345de38da400ba7e22511f263226bd48
+        checksum/secret-jobservice: d997909ea151f04cd3c6ce0da2b1e4b09ab6eecdc3d048c0d3aedf21b23285ba
+        checksum/secret-core: ea96175d9d13685272268c622197e7f602ef7f436c55dafd8e625f468586290d
    spec:
      securityContext:
        runAsUser: 10000
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    component: migrator
  annotations:
    "helm.sh/hook": pre-upgrade
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    component: registry
    app.kubernetes.io/component: registry
 spec:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
  REGISTRY_REDIS_PASSWORD: ""
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 type: Opaque
 data:
  redisURL: cmVkaXM6Ly9yZWRpcy1yZXBsaWNhdGlvbi1oYXJib3ItbWFzdGVyLmhhcmJvcjo2Mzc5LzU/aWRsZV90aW1lb3V0X3NlY29uZHM9MzA=
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - name: http-web
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - name: http-metrics
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - name: http-jobservice
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - port: 80
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - name: http-registry
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  ports:
    - name: http-trivy
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
 spec:
  jobLabel: app.kubernetes.io/name
  endpoints:
--- 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.1"
+    app.kubernetes.io/version: "2.14.2"
    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.1"
+        app.kubernetes.io/version: "2.14.2"
        component: trivy
        app.kubernetes.io/component: trivy
      annotations:
-        checksum/secret: fc65b5911a2199e425c7fe58ac4755721b8d60328a2d77b2395a2985499ac111
+        checksum/secret: 250128fa6ba0856d5b333475a0e0eb2237ccbc18a4ce84a79d405061e651f71f
    spec:
      securityContext:
        runAsUser: 10000
@@ -46,7 +46,7 @@ spec:
      automountServiceAccountToken: false
      containers:
        - name: trivy
-          image: goharbor/trivy-adapter-photon:v2.14.1
+          image: goharbor/trivy-adapter-photon:v2.14.2
          imagePullPolicy: IfNotPresent
          securityContext:
            allowPrivilegeEscalation: false