Merge pull request #679 from mrajashree/restoreEnc

Change encryption config field name in restore crd
pull/681/head
Rajashree Mandaogane 2020-09-22 11:05:13 -07:00 committed by GitHub
commit 65ecdf54e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 76 deletions

View File

@ -1,41 +1,5 @@
apiVersion: v1 apiVersion: v1
entries: entries:
backup-restore-operator:
- annotations:
catalog.cattle.io/auto-install: backup-restore-operator-crd=match
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: cattle-resources-system
catalog.cattle.io/provides-gvr: resources.cattle.io.resourceset/v1
catalog.cattle.io/release-name: backup-restore-operator
catalog.cattle.io/ui-component: backup-restore-operator
apiVersion: v1
appVersion: v0.0.1-rc13
created: "2020-09-22T17:05:34.904842253Z"
description: Backup-restore-operator can be used to backup kubernetes cluster
metadata for certain applications and restore from it
digest: 41b798c400ca0a30da96dae00ee51795e22720791636f346535a134268066822
keywords:
- applications
- infrastructure
name: backup-restore-operator
urls:
- assets/backup-restore-operator/backup-restore-operator-0.0.1.tgz
version: 0.0.1
backup-restore-operator-crd:
- annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-resources-system
catalog.cattle.io/release-name: backup-restore-operator-crd
apiVersion: v1
created: "2020-09-22T17:05:34.905110175Z"
description: Installs the CRDs for backup-restore-operator.
digest: 39db45aaa72df6a15181746469b7328b82c8952732a01673447690f2cecc2097
name: backup-restore-operator-crd
type: application
urls:
- assets/backup-restore-operator/backup-restore-operator-crd-0.0.1.tgz
version: 0.0.1
fleet: fleet:
- annotations: - annotations:
catalog.cattle.io/auto-install: fleet-crd=match catalog.cattle.io/auto-install: fleet-crd=match

View File

@ -1,41 +1,5 @@
apiVersion: v1 apiVersion: v1
entries: entries:
backup-restore-operator:
- annotations:
catalog.cattle.io/auto-install: backup-restore-operator-crd=match
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: cattle-resources-system
catalog.cattle.io/provides-gvr: resources.cattle.io.resourceset/v1
catalog.cattle.io/release-name: backup-restore-operator
catalog.cattle.io/ui-component: backup-restore-operator
apiVersion: v1
appVersion: v0.0.1-rc13
created: "2020-09-22T17:05:34.904842253Z"
description: Backup-restore-operator can be used to backup kubernetes cluster
metadata for certain applications and restore from it
digest: 41b798c400ca0a30da96dae00ee51795e22720791636f346535a134268066822
keywords:
- applications
- infrastructure
name: backup-restore-operator
urls:
- assets/backup-restore-operator/backup-restore-operator-0.0.1.tgz
version: 0.0.1
backup-restore-operator-crd:
- annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cattle-resources-system
catalog.cattle.io/release-name: backup-restore-operator-crd
apiVersion: v1
created: "2020-09-22T17:05:34.905110175Z"
description: Installs the CRDs for backup-restore-operator.
digest: 39db45aaa72df6a15181746469b7328b82c8952732a01673447690f2cecc2097
name: backup-restore-operator-crd
type: application
urls:
- assets/backup-restore-operator/backup-restore-operator-crd-0.0.1.tgz
version: 0.0.1
fleet: fleet:
- annotations: - annotations:
catalog.cattle.io/auto-install: fleet-crd=match catalog.cattle.io/auto-install: fleet-crd=match

View File

@ -1,12 +1,12 @@
apiVersion: v1 apiVersion: v1
appVersion: v0.0.1-rc13 appVersion: v0.1.0-rc1
description: Backup-restore-operator can be used to backup kubernetes cluster metadata description: Backup-restore-operator can be used to backup kubernetes cluster metadata
for certain applications and restore from it for certain applications and restore from it
name: backup-restore-operator name: backup-restore-operator
keywords: keywords:
- applications - applications
- infrastructure - infrastructure
version: 0.0.1 version: 0.1.0
annotations: annotations:
catalog.cattle.io/certified: rancher catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: cattle-resources-system catalog.cattle.io/namespace: cattle-resources-system

View File

@ -33,7 +33,7 @@ spec:
deleteTimeoutSeconds: deleteTimeoutSeconds:
maximum: 10 maximum: 10
type: integer type: integer
encryptionConfigName: encryptionConfigSecretName:
type: string type: string
prune: prune:
nullable: true nullable: true

View File

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