Merge pull request #2494 from eliyamlevy/dev-v2.7

Dev v2.7

charts/rancher-backup-crd/102.0.0+up3.1.0-rc4/Chart.yaml

@@ -4,8 +4,8 @@ annotations:
   catalog.cattle.io/namespace: cattle-resources-system
   catalog.cattle.io/release-name: rancher-backup-crd
 apiVersion: v2
-appVersion: 3.1.0-rc3
+appVersion: 3.1.0-rc4
 description: Installs the CRDs for rancher-backup.
 name: rancher-backup-crd
 type: application
-version: 102.0.0+up3.1.0-rc3
+version: 102.0.0+up3.1.0-rc4

charts/rancher-backup/102.0.0+up3.1.0-rc4/Chart.yaml

@@ -14,7 +14,7 @@ annotations:
   catalog.cattle.io/ui-component: rancher-backup
   catalog.cattle.io/upstream-version: 2.1.1
 apiVersion: v2
-appVersion: 3.1.0-rc3
+appVersion: 3.1.0-rc4
 description: Provides ability to back up and restore the Rancher application running
   on any Kubernetes cluster
 icon: https://charts.rancher.io/assets/logos/backup-restore.svg
@@ -23,4 +23,4 @@ keywords:
 - infrastructure
 kubeVersion: '>= 1.16.0-0'
 name: rancher-backup
-version: 102.0.0+up3.1.0-rc3
+version: 102.0.0+up3.1.0-rc4

charts/rancher-backup/102.0.0+up3.1.0-rc4/files/default-resourceset-contents/fleet.yaml

@@ -4,6 +4,7 @@
 - apiVersion: "v1"
   kindsRegexp: "^secrets$"
   namespaceRegexp: "^cattle-fleet-|^fleet-|^cluster-fleet-"
+  excludeResourceNameRegexp: "^import-token"
   labelSelectors:
     matchExpressions:
       - key: "owner"

charts/rancher-backup/102.0.0+up3.1.0-rc4/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: rancher/backup-restore-operator
-  tag: v3.1.0-rc3
+  tag: v3.1.0-rc4
 
 ## Default s3 bucket for storing all backup files created by the backup-restore-operator
 s3:

index.yaml

@@ -4099,11 +4099,11 @@ entries:
       catalog.cattle.io/ui-component: rancher-backup
       catalog.cattle.io/upstream-version: 2.1.1
     apiVersion: v2
-    appVersion: 3.1.0-rc3
-    created: "2023-03-20T11:12:30.851994436-04:00"
+    appVersion: 3.1.0-rc4
+    created: "2023-03-20T20:23:50.880797-04:00"
     description: Provides ability to back up and restore the Rancher application running
       on any Kubernetes cluster
-    digest: e3085131ad1aa1d634f6e90034a5d7feed5d1066abc093f6a20dafe64b4a6157
+    digest: b31dd94f179694eccc2bb0c98a9c3324468c642c4f158bd5b7ab2b20bf263e07
     icon: https://charts.rancher.io/assets/logos/backup-restore.svg
     keywords:
     - applications
@@ -4111,8 +4111,8 @@ entries:
     kubeVersion: '>= 1.16.0-0'
     name: rancher-backup
     urls:
-    - assets/rancher-backup/rancher-backup-102.0.0+up3.1.0-rc3.tgz
-    version: 102.0.0+up3.1.0-rc3
+    - assets/rancher-backup/rancher-backup-102.0.0+up3.1.0-rc4.tgz
+    version: 102.0.0+up3.1.0-rc4
   - annotations:
       catalog.cattle.io/auto-install: rancher-backup-crd=match
       catalog.cattle.io/certified: rancher
@@ -4527,15 +4527,15 @@ entries:
       catalog.cattle.io/namespace: cattle-resources-system
       catalog.cattle.io/release-name: rancher-backup-crd
     apiVersion: v2
-    appVersion: 3.1.0-rc3
-    created: "2023-03-20T11:12:31.84851535-04:00"
+    appVersion: 3.1.0-rc4
+    created: "2023-03-20T20:23:52.108785-04:00"
     description: Installs the CRDs for rancher-backup.
-    digest: 3ae9e0f032c54992b884f059d46617b44377daf65177351c8c63d657e8c3767c
+    digest: bc9af38abfbe56423db5f30f8f84332a7c4f905a0aba72596a12adcdb8a15b75
     name: rancher-backup-crd
     type: application
     urls:
-    - assets/rancher-backup-crd/rancher-backup-crd-102.0.0+up3.1.0-rc3.tgz
-    version: 102.0.0+up3.1.0-rc3
+    - assets/rancher-backup-crd/rancher-backup-crd-102.0.0+up3.1.0-rc4.tgz
+    version: 102.0.0+up3.1.0-rc4
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"

packages/rancher-backup/rancher-backup-crd/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/backup-restore-operator/releases/download/v3.1.0-rc3/rancher-backup-crd-3.1.0-rc3.tgz
+url: https://github.com/rancher/backup-restore-operator/releases/download/v3.1.0-rc4/rancher-backup-crd-3.1.0-rc4.tgz
 version: 102.0.0

packages/rancher-backup/rancher-backup/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/backup-restore-operator/releases/download/v3.1.0-rc3/rancher-backup-3.1.0-rc3.tgz
+url: https://github.com/rancher/backup-restore-operator/releases/download/v3.1.0-rc4/rancher-backup-3.1.0-rc4.tgz
 version: 102.0.0

release.yaml

@@ -34,9 +34,9 @@ rancher-alerting-drivers:
   - 102.0.0
   - 100.0.4
 rancher-backup:
-  - 102.0.0+up3.1.0-rc3
+  - 102.0.0+up3.1.0-rc4
 rancher-backup-crd:
-  - 102.0.0+up3.1.0-rc3
+  - 102.0.0+up3.1.0-rc4
 rancher-cis-benchmark:
   - 4.0.0-rc4
   - 2.1.1