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

Update rancher-backups to rc2

charts/rancher-backup-crd/3.0.1-rc2/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.0.1-rc1
+appVersion: 3.0.1-rc2
 description: Installs the CRDs for rancher-backup.
 name: rancher-backup-crd
 type: application
-version: 3.0.1-rc1
+version: 3.0.1-rc2

charts/rancher-backup/3.0.1-rc2/Chart.yaml

@@ -2,7 +2,7 @@ annotations:
   catalog.cattle.io/auto-install: rancher-backup-crd=match
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Backups
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
   catalog.cattle.io/namespace: cattle-resources-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux,windows
@@ -14,7 +14,7 @@ annotations:
   catalog.cattle.io/ui-component: rancher-backup
   catalog.cattle.io/upstream-version: 2.1.1
 apiVersion: v2
-appVersion: 3.0.1-rc1
+appVersion: 3.0.1-rc2
 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: 3.0.1-rc1
+version: 3.0.1-rc2

charts/rancher-backup/3.0.1-rc2/app-readme.md

@@ -2,7 +2,7 @@
 
 This chart enables ability to capture backups of the Rancher application and restore from these backups. This chart can be used to migrate Rancher from one Kubernetes cluster to a different Kubernetes cluster.
 
-For more information on how to use the feature, refer to our [docs](https://rancher.com/docs/rancher/v2.x/en/backups/v2.5/).
+For more information on how to use the feature, refer to our [docs](https://ranchermanager.docs.rancher.com/pages-for-subheaders/backup-restore-and-disaster-recovery).
 
 This chart installs the following components:
 

charts/rancher-backup/3.0.1-rc2/files/default-resourceset-contents/provisioningv2.yaml

@@ -15,6 +15,6 @@
   kindsRegexp: "."
 - apiVersion: "v1"
   kindsRegexp: "^secrets$"
-  resourceNameRegexp: "machine-plan$|rke-state$|machine-state$|machine-driver-secret$|machine-provision$"
+  resourceNameRegexp: "machine-plan$|rke-state$|machine-state$|machine-driver-secret$|machine-provision$|^harvesterconfig"
   namespaces:
   - "fleet-default"

charts/rancher-backup/3.0.1-rc2/templates/hardened.yaml

@@ -52,11 +52,13 @@ rules:
   - apiGroups: [""]
     resources: ["serviceaccounts"]
     verbs: ["get", "patch"]
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy"}}
   - apiGroups: ["policy"]
     resources: ["podsecuritypolicies"]
     verbs:     ["use"]
     resourceNames:
       - {{ include "backupRestore.fullname" . }}-patch-sa
+{{- end}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -75,6 +77,7 @@ subjects:
     name: {{ include "backupRestore.fullname" . }}-patch-sa
     namespace: {{ .Release.Namespace }}
 ---
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy"}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -105,6 +108,7 @@ spec:
   readOnlyRootFilesystem: false
   volumes:
     - 'secret'
+{{- end}}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

charts/rancher-backup/3.0.1-rc2/templates/psp.yaml

@@ -1,3 +1,4 @@
+{{- if .Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy" -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -27,3 +28,4 @@ spec:
   volumes:
     - 'persistentVolumeClaim'
     - 'secret'
+{{- end -}}

charts/rancher-backup/3.0.1-rc2/values.yaml

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

index.yaml

@@ -3663,7 +3663,7 @@ entries:
       catalog.cattle.io/auto-install: rancher-backup-crd=match
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Rancher Backups
-      catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
+      catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
       catalog.cattle.io/namespace: cattle-resources-system
       catalog.cattle.io/os: linux
       catalog.cattle.io/permits-os: linux,windows
@@ -3675,11 +3675,11 @@ entries:
       catalog.cattle.io/ui-component: rancher-backup
       catalog.cattle.io/upstream-version: 2.1.1
     apiVersion: v2
-    appVersion: 3.0.1-rc1
-    created: "2022-12-08T15:21:25.229237-05:00"
+    appVersion: 3.0.1-rc2
+    created: "2022-12-19T15:17:03.546578-05:00"
     description: Provides ability to back up and restore the Rancher application running
       on any Kubernetes cluster
-    digest: cef8ab484f24951e44f10706a8d84f6da996a635939f16de448ff0c6d3101a98
+    digest: 99d7f3f9da53cde3fed861647c6b6ce874478ce2958a907ea1fca25fc88e7069
     icon: https://charts.rancher.io/assets/logos/backup-restore.svg
     keywords:
     - applications
@@ -3687,8 +3687,8 @@ entries:
     kubeVersion: '>= 1.16.0-0'
     name: rancher-backup
     urls:
-    - assets/rancher-backup/rancher-backup-3.0.1-rc1.tgz
-    version: 3.0.1-rc1
+    - assets/rancher-backup/rancher-backup-3.0.1-rc2.tgz
+    version: 3.0.1-rc2
   - annotations:
       catalog.cattle.io/auto-install: rancher-backup-crd=match
       catalog.cattle.io/certified: rancher
@@ -4103,15 +4103,15 @@ entries:
       catalog.cattle.io/namespace: cattle-resources-system
       catalog.cattle.io/release-name: rancher-backup-crd
     apiVersion: v2
-    appVersion: 3.0.1-rc1
-    created: "2022-12-08T15:21:26.59275-05:00"
+    appVersion: 3.0.1-rc2
+    created: "2022-12-19T15:17:04.784921-05:00"
     description: Installs the CRDs for rancher-backup.
-    digest: 54a5680f43e55eeca1828406fe150f92e055f0cdcf18dec7b5eddc08c42ae807
+    digest: d5bcca5a84775659375363d5162a0c580f73847aeced85f459b16807e55ca5dc
     name: rancher-backup-crd
     type: application
     urls:
-    - assets/rancher-backup-crd/rancher-backup-crd-3.0.1-rc1.tgz
-    version: 3.0.1-rc1
+    - assets/rancher-backup-crd/rancher-backup-crd-3.0.1-rc2.tgz
+    version: 3.0.1-rc2
   - 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.0.1-rc1/rancher-backup-crd-3.0.1-rc1.tgz
-version: 3.0.1-rc1
+url: https://github.com/rancher/backup-restore-operator/releases/download/v3.0.1-rc2/rancher-backup-crd-3.0.1-rc2.tgz
+version: 3.0.1-rc2

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

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/backup-restore-operator/releases/download/v3.0.1-rc1/rancher-backup-3.0.1-rc1.tgz
-version: 3.0.1-rc1
+url: https://github.com/rancher/backup-restore-operator/releases/download/v3.0.1-rc2/rancher-backup-3.0.1-rc2.tgz
+version: 3.0.1-rc2

release.yaml

@@ -39,9 +39,9 @@ rancher-vsphere-cpi:
 rancher-vsphere-csi:
 - 101.1.0+up2.6.2-rancher1
 rancher-backup:
-- 3.0.1-rc1
+- 3.0.1-rc2
 rancher-backup-crd:
-- 3.0.1-rc1
+- 3.0.1-rc2
 rancher-cis-benchmark:
 - 3.0.1-rc2
 rancher-cis-benchmark-crd:
@@ -55,4 +55,4 @@ rancher-logging:
 sriov:
 - 101.0.2+up0.1.0
 sriov-crd:
-- 101.0.2+up0.1.0
+- 101.0.2+up0.1.0