Skip to content

OADP-599: Auto create s3 restic secrets for volsync from BSLs #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Jul 27, 2022
Merged

OADP-599: Auto create s3 restic secrets for volsync from BSLs #747

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7a0a69c
adding restic secret creation per bsl
savitharaghunathan Jun 29, 2022
83fad58
Adding per bsl restic secret creation
savitharaghunathan Jun 29, 2022
98a4b5a
fixing minor bugs
savitharaghunathan Jun 29, 2022
9eaaa61
Adding owner ref
savitharaghunathan Jun 30, 2022
c6a5faa
add crd bases changes
savitharaghunathan Jul 1, 2022
58224dd
adding review feedback
savitharaghunathan Jul 6, 2022
75b4e5e
feedback changes
savitharaghunathan Jul 7, 2022
b8ff9bf
Merge remote-tracking branch 'upstream/master' into resticsecret_update
savitharaghunathan Jul 8, 2022
09741d5
adding review feedback
savitharaghunathan Jul 8, 2022
3ae7e2c
adding manifest changes
savitharaghunathan Jul 8, 2022
8d0307b
fixing typpo
savitharaghunathan Jul 8, 2022
c1416db
adding checks
savitharaghunathan Jul 8, 2022
24cf925
resolving conflicts
savitharaghunathan Jul 14, 2022
78b0c2f
adding func to accomodate different s3 url style
savitharaghunathan Jul 14, 2022
e58ab18
resolving conflicts
savitharaghunathan Jul 20, 2022
f8bc00c
Adding make bundle changes
savitharaghunathan Jul 20, 2022
9c404af
Adding make bundle crd changes
savitharaghunathan Jul 20, 2022
5cc5f07
Changing restic secret name to dm-credential
savitharaghunathan Jul 21, 2022
554d405
adding api changes
savitharaghunathan Jul 21, 2022
2ae3260
Move DM restic secret creation to reconcile batch and add other revie…
savitharaghunathan Jul 22, 2022
9540a7f
adding DM feature conditional
savitharaghunathan Jul 22, 2022
01e0aff
Adding datamoverenable check func
savitharaghunathan Jul 22, 2022
5aac1f0
fixing make bundle output issue
savitharaghunathan Jul 25, 2022
8fb6247
Adding bundle changes for vsb CR
savitharaghunathan Jul 26, 2022
593dd0c
Merge remote-tracking branch 'upstream/master' into resticsecret_update
savitharaghunathan Jul 27, 2022
a517571
adding more validations to restic secret check
savitharaghunathan Jul 27, 2022
cbb7400
edit restic secret desc in crd/bases & manifests
savitharaghunathan Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions api/v1alpha1/oadp_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const ReconcileCompleteMessage = "Reconcile complete"
const OadpOperatorLabel = "openshift.io/oadp"
const RegistryDeploymentLabel = "openshift.io/oadp-registry"
const DataMoverDeploymentLabel = "openshift.io/oadp-data-mover"
const OadpBSLnameLabel = "openshift.io/oadp-bsl-name"

type DefaultPlugin string

Expand Down Expand Up @@ -159,11 +160,21 @@ type SnapshotLocation struct {
Velero *velero.VolumeSnapshotLocationSpec `json:"velero"`
}

// DataMover defines the various config for DPA data mover
type DataMover struct {
// EnableDataMover is used to specify whether you want to deploy the volume snapshot mover controller and a modified csi datamover plugin
// +optional
Enable bool `json:"enable,omitempty"`
// User supplied Restic Secret name
// +optional
CredentialName string `json:"credentialName,omitempty"`
}

// Features defines the configuration for the DPA to enable the tech preview features
type Features struct {
// EnableDataMover is used to specify whether you want to deploy the volume snapshot mover controller and a modified csi datamover plugin
// Contains data mover specific configurations
// +optional
EnableDataMover bool `json:"enableDataMover,omitempty"`
DataMover *DataMover `json:"dataMover"`
}

// DataProtectionApplicationSpec defines the desired state of Velero
Expand Down
22 changes: 21 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 13 additions & 5 deletions bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -443,11 +444,18 @@ spec:
description: Features defines the configuration for the DPA to enable
the OADP tech preview features
properties:
enableDataMover:
description: EnableDataMover is used to specify whether you want
to deploy the volume snapshot mover controller and a modified
csi datamover plugin
type: boolean
dataMover:
description: Contains data mover specific configurations
properties:
credentialName:
description: User supplied Restic Secret name
type: string
enable:
description: EnableDataMover is used to specify whether you
want to deploy the volume snapshot mover controller and
a modified csi datamover plugin
type: boolean
type: object
type: object
podAnnotations:
additionalProperties:
Expand Down
27 changes: 17 additions & 10 deletions config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ spec:
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
nullable: true
type: object
nullable: true
requests:
additionalProperties:
anyOf:
Expand All @@ -235,8 +235,8 @@ spec:
for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
nullable: true
type: object
nullable: true
type: object
tolerations:
description: Tolerations defines the list of tolerations
Expand Down Expand Up @@ -334,6 +334,7 @@ spec:
- fatal
- panic
type: string
nullable: true
noDefaultBackupLocation:
description: If you need to install Velero without a default
backup storage location NoDefaultBackupLocation flag is
Expand Down Expand Up @@ -363,13 +364,12 @@ spec:
anyOf:
- type: integer
- type: string
nullable: true
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
nullable: true
type: object
nullable: true
requests:
additionalProperties:
anyOf:
Expand All @@ -383,8 +383,8 @@ spec:
for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
nullable: true
type: object
nullable: true
type: object
tolerations:
description: Tolerations defines the list of tolerations
Expand Down Expand Up @@ -445,11 +445,18 @@ spec:
description: Features defines the configuration for the DPA to enable
the OADP tech preview features
properties:
enableDataMover:
description: EnableDataMover is used to specify whether you want
to deploy the volume snapshot mover controller and a modified
csi datamover plugin
type: boolean
dataMover:
description: Contains data mover specific configurations
properties:
credentialName:
description: User supplied Restic Secret name
type: string
enable:
description: EnableDataMover is used to specify whether you
want to deploy the volume snapshot mover controller and
a modified csi datamover plugin
type: boolean
type: object
type: object
podAnnotations:
additionalProperties:
Expand Down
Loading