Merge remote-tracking branch 'upstream/release-v2.8' into dev-v2.8

.github/workflows/regsync-config.yaml

@@ -43,26 +43,32 @@ jobs:
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
 
-      # Need to remove export version once rancher/charts gets the latest version 
-      # of charts-build-script binary.
-      # Test removal of regsync.yaml, commit and push before regenerating it
       - name: Generate RegSync
         run: |
           echo ${{ secrets.PUSH_TOKEN }} | gh auth login --with-token
           gh pr checkout ${{ github.event.pull_request.number }}
           git config --global user.email "${{ secrets.USER_GITHUB }}"
           git config --global user.name "rancherbot"
-          export CHARTS_BUILD_SCRIPT_VERSION=v0.4.2 
           make pull-scripts
           make regsync
 
+      - name: Check for modifications in regsync.yaml
+        id: check_changes
+        run: |
+            git diff --quiet regsync.yaml || echo "::set-output name=changed::true"
+
       - name: Commit files
+        if: steps.check_changes.outputs.changed == 'true'
         run: |
             git add regsync.yaml
             git commit -m "Updating resync.yaml"
-            git branch
             git push
 
+      - name: No changes in regsync.yaml
+        if: steps.check_changes.outputs.changed != 'true'
+        run: |
+            echo "regsync.yaml is the same"
+
       - name: Install Regsync
         run: |
           curl --silent --fail --location --output regsync https://github.com/regclient/regclient/releases/download/v0.5.1/regsync-linux-amd64
@@ -70,9 +76,11 @@ jobs:
 
       - name: Sync Images to Registry
         run: |
+          export PATH=$PATH:$(pwd)
           head regsync.yaml
           ruby ./regsync-split.rb
-          time find regsync -type f -name split-regsync.yaml -print -exec time regsync once --config '{}' ';'
+          tree ./split-regsync
+          time find split-regsync -type f -name split-regsync.yaml -print -exec time regsync once --config '{}' ';'
         env:
           REGISTRY_ENDPOINT: ${{ secrets.REGISTRY_ENDPOINT }}
           REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}

regsync.yaml

@@ -4,6 +4,8 @@ creds:
 - registry: '{{ env "REGISTRY_ENDPOINT" }}'
   user: '{{ env "REGISTRY_USERNAME" }}'
   pass: '{{ env "REGISTRY_PASSWORD" }}'
+  reqConcurrent: 10
+  reqPerSec: 50
 defaults:
   mediaTypes:
   - application/vnd.docker.distribution.manifest.v2+json
@@ -25,6 +27,8 @@ sync:
     - v1.0.7
     - v1.0.9
     - v1.1.0
+    - v1.1.1
+    - v1.1.2
 - source: docker.io/rancher/backup-restore-operator
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/backup-restore-operator'
   type: repository
@@ -45,6 +49,7 @@ sync:
     - v2.1.5
     - v3.0.0
     - v3.1.0
+    - v3.1.1
 - source: docker.io/rancher/banzaicloud-fluentd
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/banzaicloud-fluentd'
   type: repository
@@ -67,6 +72,7 @@ sync:
     - v1.0.1
     - v1.0.10
     - v1.0.11
+    - v1.0.12
     - v1.0.3
     - v1.0.4
     - v1.0.5
@@ -156,6 +162,7 @@ sync:
     - v0.5.1
     - v0.5.3
     - v0.6.0
+    - v0.7.0
 - source: docker.io/rancher/fleet-agent
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/fleet-agent'
   type: repository
@@ -180,6 +187,7 @@ sync:
     - v0.5.1
     - v0.5.3
     - v0.6.0
+    - v0.7.0
 - source: docker.io/rancher/fluent-bit
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/fluent-bit'
   type: repository
@@ -222,6 +230,7 @@ sync:
     - v0.1.32
     - v0.1.32-security1
     - v0.1.37
+    - v0.1.54
     - v0.1.6
     - v0.1.8
 - source: docker.io/rancher/gke-operator
@@ -247,6 +256,7 @@ sync:
     allow:
     - v0.11.2-build20220901
     - v0.12.1-build20230120
+    - v0.13.2-build20230605
 - source: docker.io/rancher/harvester-cloud-provider
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/harvester-cloud-provider'
   type: repository
@@ -272,6 +282,7 @@ sync:
     allow:
     - v0.0.1
     - v0.1.0
+    - v0.2.1
 - source: docker.io/rancher/istio-coredns-plugin
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/istio-coredns-plugin'
   type: repository
@@ -391,6 +402,7 @@ sync:
     - v1.21.9
     - v1.22.6
     - v1.23.3
+    - v1.26.3
 - source: docker.io/rancher/library-busybox
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/library-busybox'
   type: repository
@@ -524,10 +536,15 @@ sync:
     - v1.22.5
     - v1.22.6
     - v1.22.7
+    - v1.22.8
     - v1.23.0
     - v1.23.3
+    - v1.23.4
     - v1.24.3
+    - v1.24.5
     - v1.25.0
+    - v1.25.2
+    - v1.26.1
 - source: docker.io/rancher/mirrored-cloud-provider-vsphere-csi-release-driver
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver'
   type: repository
@@ -541,7 +558,10 @@ sync:
     - v2.5.1
     - v2.5.4
     - v2.6.2
+    - v2.6.3
     - v2.7.0
+    - v2.7.1
+    - v3.0.1
 - source: docker.io/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer'
   type: repository
@@ -555,7 +575,10 @@ sync:
     - v2.5.1
     - v2.5.4
     - v2.6.2
+    - v2.6.3
     - v2.7.0
+    - v2.7.1
+    - v3.0.1
 - source: docker.io/rancher/mirrored-coredns-coredns
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-coredns-coredns'
   type: repository
@@ -596,6 +619,7 @@ sync:
   tags:
     allow:
     - v2.35.3
+    - v2.36.0
 - source: docker.io/rancher/mirrored-directxman12-k8s-prometheus-adapter
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-directxman12-k8s-prometheus-adapter'
   type: repository
@@ -616,6 +640,7 @@ sync:
     allow:
     - v1.2.0
     - v1.6.2
+    - v1.8.1
 - source: docker.io/rancher/mirrored-epinio-epinio-ui
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-epinio-epinio-ui'
   type: repository
@@ -623,6 +648,7 @@ sync:
     allow:
     - v1.2.0-0.0.1
     - v1.5.1-0.0.3
+    - v1.8.1-0.0.1
 - source: docker.io/rancher/mirrored-epinio-epinio-unpacker
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-epinio-epinio-unpacker'
   type: repository
@@ -630,6 +656,7 @@ sync:
     allow:
     - 1.0
     - v1.6.2
+    - v1.8.1
 - source: docker.io/rancher/mirrored-fluent-fluent-bit
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-fluent-fluent-bit'
   type: repository
@@ -675,6 +702,7 @@ sync:
     - 3.2.2
     - 3.2.3
     - 4.2.0
+    - 4.2.1
 - source: docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-ingress-nginx-kube-webhook-certgen'
   type: repository
@@ -880,6 +908,7 @@ sync:
     - 1.21.1-alpine
     - 1.23.0-alpine
     - 1.23.2-alpine
+    - 1.24.0-alpine
 - source: docker.io/rancher/mirrored-library-registry
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-library-registry'
   type: repository
@@ -894,6 +923,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
     - v1_20210422
     - v1_20210422_patch1
     - v2_20210820
@@ -912,6 +943,7 @@ sync:
     - v2.2.1-lh2
     - v3.2.1
     - v3.4.0
+    - v4.2.0
 - source: docker.io/rancher/mirrored-longhornio-csi-node-driver-registrar
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-csi-node-driver-registrar'
   type: repository
@@ -920,6 +952,7 @@ sync:
     - v1.2.0-lh1
     - v2.3.0
     - v2.5.0
+    - v2.7.0
 - source: docker.io/rancher/mirrored-longhornio-csi-provisioner
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-csi-provisioner'
   type: repository
@@ -928,6 +961,7 @@ sync:
     - v1.6.0-lh1
     - v1.6.0-lh2
     - v2.1.2
+    - v3.4.1
 - source: docker.io/rancher/mirrored-longhornio-csi-resizer
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-csi-resizer'
   type: repository
@@ -937,6 +971,7 @@ sync:
     - v0.5.1-lh2
     - v1.2.0
     - v1.3.0
+    - v1.7.0
 - source: docker.io/rancher/mirrored-longhornio-csi-snapshotter
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-csi-snapshotter'
   type: repository
@@ -946,12 +981,14 @@ sync:
     - v2.1.1-lh2
     - v3.0.3
     - v5.0.1
+    - v6.2.1
 - source: docker.io/rancher/mirrored-longhornio-livenessprobe
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-livenessprobe'
   type: repository
   tags:
     allow:
     - v2.8.0
+    - v2.9.0
 - source: docker.io/rancher/mirrored-longhornio-longhorn-engine
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-longhorn-engine'
   type: repository
@@ -973,6 +1010,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
 - source: docker.io/rancher/mirrored-longhornio-longhorn-instance-manager
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-longhorn-instance-manager'
   type: repository
@@ -981,6 +1020,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
     - v1_20201216
     - v1_20210621
     - v1_20210731
@@ -1013,6 +1054,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
 - source: docker.io/rancher/mirrored-longhornio-longhorn-share-manager
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-longhorn-share-manager'
   type: repository
@@ -1021,6 +1064,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
     - v1_20201204
     - v1_20210416
     - v1_20210416_patch1
@@ -1053,6 +1098,8 @@ sync:
     - v1.4.0
     - v1.4.1
     - v1.4.2
+    - v1.4.3
+    - v1.5.1
 - source: docker.io/rancher/mirrored-longhornio-support-bundle-kit
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-longhornio-support-bundle-kit'
   type: repository
@@ -1061,6 +1108,7 @@ sync:
     - v0.0.17
     - v0.0.19
     - v0.0.24
+    - v0.0.25
 - source: docker.io/rancher/mirrored-messagebird-sachet
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-messagebird-sachet'
   type: repository
@@ -1076,6 +1124,7 @@ sync:
     allow:
     - RELEASE.2022-05-09T04-08-26Z
     - RELEASE.2022-12-13T00-23-28Z
+    - RELEASE.2023-01-28T20-29-38Z
 - source: docker.io/rancher/mirrored-minio-minio
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-minio-minio'
   type: repository
@@ -1083,6 +1132,7 @@ sync:
     allow:
     - RELEASE.2022-05-08T23-50-31Z
     - RELEASE.2022-12-12T19-27-27Z
+    - RELEASE.2023-02-10T18-48-39Z
 - source: docker.io/rancher/mirrored-neuvector-controller
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-controller'
   type: repository
@@ -1095,6 +1145,7 @@ sync:
     - 5.1.1
     - 5.1.2
     - 5.1.3
+    - 5.2.0
 - source: docker.io/rancher/mirrored-neuvector-enforcer
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-enforcer'
   type: repository
@@ -1107,6 +1158,7 @@ sync:
     - 5.1.1
     - 5.1.2
     - 5.1.3
+    - 5.2.0
 - source: docker.io/rancher/mirrored-neuvector-manager
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-manager'
   type: repository
@@ -1119,6 +1171,19 @@ sync:
     - 5.1.1
     - 5.1.2
     - 5.1.3
+    - 5.2.0
+- source: docker.io/rancher/mirrored-neuvector-prometheus-exporter
+  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-prometheus-exporter'
+  type: repository
+  tags:
+    allow:
+    - 5.2.0
+- source: docker.io/rancher/mirrored-neuvector-registry-adapter
+  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-registry-adapter'
+  type: repository
+  tags:
+    allow:
+    - 0.1.0
 - source: docker.io/rancher/mirrored-neuvector-scanner
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-neuvector-scanner'
   type: repository
@@ -1137,6 +1202,7 @@ sync:
   tags:
     allow:
     - v3.10.0
+    - v3.12.0
     - v3.3.0
     - v3.5.1
     - v3.6.0
@@ -1149,6 +1215,7 @@ sync:
   tags:
     allow:
     - v3.10.0
+    - v3.12.0
     - v3.6.0
     - v3.7.1
     - v3.8.1
@@ -1159,6 +1226,7 @@ sync:
   tags:
     allow:
     - 0.2.289-full
+    - 0.2.407-full
     - 0.2.95-full
 - source: docker.io/rancher/mirrored-prom-alertmanager
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-prom-alertmanager'
@@ -1227,6 +1295,12 @@ sync:
     - v2.27.1
     - v2.28.1
     - v2.38.0
+- source: docker.io/rancher/mirrored-s3gw-s3gw
+  target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-s3gw-s3gw'
+  type: repository
+  tags:
+    allow:
+    - v0.14.0
 - source: docker.io/rancher/mirrored-sig-storage-csi-attacher
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-csi-attacher'
   type: repository
@@ -1235,6 +1309,8 @@ sync:
     - v3.2.0
     - v3.3.0
     - v3.4.0
+    - v3.5.0
+    - v4.2.0
 - source: docker.io/rancher/mirrored-sig-storage-csi-node-driver-registrar
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-csi-node-driver-registrar'
   type: repository
@@ -1243,6 +1319,8 @@ sync:
     - v2.3.0
     - v2.5.0
     - v2.5.1
+    - v2.6.2
+    - v2.7.0
 - source: docker.io/rancher/mirrored-sig-storage-csi-provisioner
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-csi-provisioner'
   type: repository
@@ -1252,6 +1330,8 @@ sync:
     - v3.0.0
     - v3.1.0
     - v3.2.1
+    - v3.3.0
+    - v3.4.0
 - source: docker.io/rancher/mirrored-sig-storage-csi-resizer
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-csi-resizer'
   type: repository
@@ -1259,6 +1339,8 @@ sync:
     allow:
     - v1.3.0
     - v1.4.0
+    - v1.6.0
+    - v1.7.0
 - source: docker.io/rancher/mirrored-sig-storage-livenessprobe
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-livenessprobe'
   type: repository
@@ -1267,6 +1349,8 @@ sync:
     - v2.4.0
     - v2.6.0
     - v2.7.0
+    - v2.8.0
+    - v2.9.0
 - source: docker.io/rancher/mirrored-sigwindowstools-k8s-gmsa-webhook
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sigwindowstools-k8s-gmsa-webhook'
   type: repository
@@ -1286,6 +1370,7 @@ sync:
     allow:
     - v0.16.3
     - v0.53.2
+    - v0.56.16
     - v0.56.7
 - source: docker.io/rancher/mirrored-squareup-ghostunnel
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-squareup-ghostunnel'
@@ -1332,6 +1417,8 @@ sync:
     allow:
     - v0.1.0
     - v0.2.1
+    - v0.3.0
+    - v0.3.2
 - source: docker.io/rancher/pushprox-client
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/pushprox-client'
   type: repository
@@ -1362,6 +1449,7 @@ sync:
     - v1.0.1
     - v2.0.0
     - v2.0.1
+    - v2.0.2
 - source: docker.io/rancher/rancher-webhook
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/rancher-webhook'
   type: repository
@@ -1379,6 +1467,7 @@ sync:
     - v0.1.6
     - v0.2.0
     - v0.2.1
+    - v0.2.10
     - v0.2.2
     - v0.2.5
     - v0.2.6
@@ -1388,6 +1477,7 @@ sync:
     - v0.3.2
     - v0.3.3
     - v0.3.4
+    - v0.3.5
 - source: docker.io/rancher/security-scan
   target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/security-scan'
   type: repository
@@ -1396,6 +1486,7 @@ sync:
     - v0.2.1
     - v0.2.10
     - v0.2.11
+    - v0.2.12
     - v0.2.2
     - v0.2.3
     - v0.2.4
@@ -1432,6 +1523,7 @@ sync:
   tags:
     allow:
     - v0.10.0
+    - v0.11.0
     - v0.7.5
     - v0.8.1
     - v0.9.1
@@ -1444,6 +1536,7 @@ sync:
     - v0.1.1
     - v0.1.11
     - v0.1.2
+    - v0.1.22
     - v0.1.3
     - v0.1.5
     - v0.1.6