From 00d42a178c7fd880c20eba136d4ebfc905abcefb Mon Sep 17 00:00:00 2001 From: rajashree Date: Tue, 15 Sep 2020 14:23:34 -0700 Subject: [PATCH] Expand default resourceset to include 2.5 CRDs --- .../backup-restore-operator-0.0.1.tgz | Bin 3441 -> 0 bytes .../backup-restore-operator-crd-0.0.1.tgz | Bin 1720 -> 0 bytes .../backup-restore-operator/charts/Chart.yaml | 2 +- .../charts/templates/rancher-resourceset.yaml | 18 +++++++++++++++++- .../charts/values.yaml | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) delete mode 100644 assets/backup-restore-operator/backup-restore-operator-0.0.1.tgz delete mode 100644 assets/backup-restore-operator/backup-restore-operator-crd-0.0.1.tgz diff --git a/assets/backup-restore-operator/backup-restore-operator-0.0.1.tgz b/assets/backup-restore-operator/backup-restore-operator-0.0.1.tgz deleted file mode 100644 index 94103da87eeec8913e2e2287c7c99a89102f75a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3441 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 O0RR8~xD=HDHUI#6zd^D9 diff --git a/packages/backup-restore-operator/charts/Chart.yaml b/packages/backup-restore-operator/charts/Chart.yaml index b3375fdd5..44fd155de 100644 --- a/packages/backup-restore-operator/charts/Chart.yaml +++ b/packages/backup-restore-operator/charts/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v0.0.1-rc11 +appVersion: v0.0.1-rc12 description: Backup-restore-operator can be used to backup kubernetes cluster metadata for certain applications and restore from it name: backup-restore-operator diff --git a/packages/backup-restore-operator/charts/templates/rancher-resourceset.yaml b/packages/backup-restore-operator/charts/templates/rancher-resourceset.yaml index d10090995..d68815ec2 100644 --- a/packages/backup-restore-operator/charts/templates/rancher-resourceset.yaml +++ b/packages/backup-restore-operator/charts/templates/rancher-resourceset.yaml @@ -17,16 +17,32 @@ resourceSelectors: - apiVersion: "rbac.authorization.k8s.io/v1" kindsRegexp: "^clusterrolebindings$" resourceNameRegexp: "^cattle-|^clusterrolebinding-|^globaladmin-user-|^grb-u-" + resourceNames: + - "eks-operator" - apiVersion: "rbac.authorization.k8s.io/v1" kindsRegexp: "^clusterroles$" resourceNameRegexp: "^cattle-|^p-|^c-|^local-|^user-|^u-|^project-|^create-ns$" + resourceNames: + - "eks-operator" - apiVersion: "apiextensions.k8s.io/v1beta1" kindsRegexp: "." - resourceNameRegexp: "management.cattle.io$|project.cattle.io$" + resourceNameRegexp: "management.cattle.io$|project.cattle.io$|catalog.cattle.io$|eks.cattle.io$|resources.cattle.io$" - apiVersion: "management.cattle.io/v3" kindsRegexp: "." - apiVersion: "project.cattle.io/v3" kindsRegexp: "." + - apiVersion: "catalog.cattle.io/v1" + kindsRegexp: "." + - apiVersion: "resources.cattle.io/v1" + kindsRegexp: "^ResourceSet$" + - apiVersion: "eks.cattle.io/v1" + kindsRegexp: "." + - apiVersion: "apps/v1" + kindsRegexp: "^deployments$" + resourceNames: + - "eks-config-operator" + namespaces: + - "cattle-system" controllerReferences: - apiVersion: "apps/v1" resource: "deployments" diff --git a/packages/backup-restore-operator/charts/values.yaml b/packages/backup-restore-operator/charts/values.yaml index b50e3ca4a..bf8ec398b 100644 --- a/packages/backup-restore-operator/charts/values.yaml +++ b/packages/backup-restore-operator/charts/values.yaml @@ -1,6 +1,6 @@ image: repository: rancher/backup-restore-operator - tag: v0.0.1-rc11 + tag: v0.0.1-rc12 ## Default s3 bucket for storing all backup files created by the backup-restore-operator s3: