OADP-1821: storageClass mapping for data mover volumeOptions by eemcmullan · Pull Request #1006 · openshift/oadp-operator

eemcmullan · 2023-05-15T22:06:08Z

No description provided.

openshift-ci · 2023-05-15T22:06:13Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

controllers/datamover.go

tests/e2e/lib/dpa_helpers.go

controllers/datamover.go

kaovilai · 2023-05-16T15:26:24Z

api/v1alpha1/oadp_types.go

+	// defines configurations for data mover volume options for a storageClass
 	// +optional
-	DataMoverVolumeOptions *DataMoverVolumeOptions `json:"volumeOptions,omitempty"`
+	StorageClass map[string]DataMoverVolumeOptions `json:"storageClass,omitempty"`


Are we just removing volumeoptions in general?
Thought we were looking to expose the useMoverContext elsewhere.

This is a separate issue from securityContext. This is to create a mapping of storgeClasses to volumeOptions

The name is confusing. Calling it StorageClass makes it look like the value is the name of a storage class rather than a mapping of storage classes to volume options. The original DataMoverVolumeOptions name might be better, or maybe DataMoverVolumeOptionsForStorageClasses (or shortened to VolumeOptionsForStorageClasses)

eemcmullan · 2023-05-16T17:04:47Z

/hold

openshift-ci-robot · 2023-05-17T15:04:38Z

@eemcmullan: This pull request references OADP-1821 which is a valid jira issue.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

…nto sc-mapping

weshayutin · 2023-05-17T22:49:16Z

/test 4.10-operator-e2e-gcp

controllers/datamover.go

…nto sc-mapping

Co-authored-by: Emily McMullan <[email protected]>

Signed-off-by: Tiger Kaovilai <[email protected]>

…class name. Signed-off-by: Tiger Kaovilai <[email protected]>

kaovilai · 2023-05-18T18:44:56Z

/test 4.11-operator-unit-test

…nto sc-mapping

shubham-pampattiwar · 2023-05-18T21:15:40Z

@eemcmullan Please resolve the conflicts on this PR.

shubham-pampattiwar · 2023-05-19T16:12:01Z

/lgtm

openshift-ci · 2023-05-19T16:12:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eemcmullan, kaovilai, shubham-pampattiwar, sseago

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [eemcmullan,kaovilai,shubham-pampattiwar,sseago]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

shubham-pampattiwar · 2023-05-19T16:12:39Z

/unhold

shubham-pampattiwar · 2023-05-19T16:20:50Z

/cherry-pick oadp-1.2

openshift-cherrypick-robot · 2023-05-19T16:20:52Z

@shubham-pampattiwar: once the present PR merges, I will cherry-pick it on top of oadp-1.2 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick oadp-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

eemcmullan · 2023-05-19T17:38:18Z

/test 4.10-operator-e2e-aws

openshift-ci · 2023-05-19T17:56:13Z

New changes are detected. LGTM label has been removed.

Signed-off-by: Tiger Kaovilai <[email protected]>

weshayutin · 2023-05-19T19:57:24Z

https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_oadp[…]/artifacts/operator-e2e-azure/e2e/build-log.txt
pass ^

https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_oadp[…]60/artifacts/operator-e2e-gcp/e2e/build-log.txt
pass ^

https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_oadp[…]24/artifacts/operator-e2e-aws/e2e/build-log.txt
pass ^

openshift-ci · 2023-05-19T19:58:06Z

@eemcmullan: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/4.10-operator-e2e-gcp	`df9357e`	link	true	`/test 4.10-operator-e2e-gcp`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-cherrypick-robot · 2023-05-19T19:58:28Z

@shubham-pampattiwar: #1006 failed to apply on top of branch "oadp-1.2":

Applying: SC to datamover api
Using index info to reconstruct a base tree...
M	api/v1alpha1/oadp_types.go
M	api/v1alpha1/zz_generated.deepcopy.go
M	config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
M	controllers/datamover.go
M	tests/e2e/lib/dpa_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/lib/dpa_helpers.go
CONFLICT (content): Merge conflict in tests/e2e/lib/dpa_helpers.go
Auto-merging controllers/datamover.go
Auto-merging config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
CONFLICT (content): Merge conflict in config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
Auto-merging api/v1alpha1/zz_generated.deepcopy.go
Auto-merging api/v1alpha1/oadp_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 SC to datamover api
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick oadp-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

…ft#1006) * SC to datamover api * check for existing sc in cluster * bundle updates Co-authored-by: Emily McMullan <[email protected]> * Use typed strings for accessMode Signed-off-by: Tiger Kaovilai <[email protected]> * Add spec.features.datamover.storageclass to e2e with provider storageclass name. Signed-off-by: Tiger Kaovilai <[email protected]> * rename volumeoptions sc * update crds * Fix `ProviderStorageClassName()` relative path Signed-off-by: Tiger Kaovilai <[email protected]> --------- Signed-off-by: Tiger Kaovilai <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]>

SC to datamover api

6d33144

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 15, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2023

eemcmullan commented May 15, 2023

View reviewed changes

controllers/datamover.go Outdated Show resolved Hide resolved

eemcmullan commented May 15, 2023

View reviewed changes

tests/e2e/lib/dpa_helpers.go Outdated Show resolved Hide resolved

eemcmullan commented May 15, 2023

View reviewed changes

controllers/datamover.go Show resolved Hide resolved

kaovilai reviewed May 16, 2023

View reviewed changes

check for existing sc in cluster

d9263a1

eemcmullan marked this pull request as ready for review May 16, 2023 16:30

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 16, 2023

openshift-ci bot requested review from kaovilai and savitharaghunathan May 16, 2023 16:31

eemcmullan requested a review from shubham-pampattiwar May 16, 2023 16:34

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2023

eemcmullan changed the title ~~storageClass mapping for data mover volumeOptions~~ OADP-1821: storageClass mapping for data mover volumeOptions May 17, 2023

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 17, 2023

Merge branch 'master' of https://github.com/openshift/oadp-operator i…

70aad10

…nto sc-mapping

weshayutin reviewed May 17, 2023

View reviewed changes

controllers/datamover.go Show resolved Hide resolved

eemcmullan and others added 3 commits May 18, 2023 09:52

Merge branch 'master' of https://github.com/openshift/oadp-operator i…

28cf7fc

…nto sc-mapping

bundle updates

7cec355

Co-authored-by: Emily McMullan <[email protected]>

Use typed strings for accessMode

0f61911

Signed-off-by: Tiger Kaovilai <[email protected]>

kaovilai force-pushed the sc-mapping branch from 6f6bab3 to 5f00472 Compare May 18, 2023 18:38

Add spec.features.datamover.storageclass to e2e with provider storage…

81d5b16

…class name. Signed-off-by: Tiger Kaovilai <[email protected]>

kaovilai force-pushed the sc-mapping branch from 5f00472 to 81d5b16 Compare May 18, 2023 18:39

Merge branch 'master' of https://github.com/openshift/oadp-operator i…

7f577e1

…nto sc-mapping

openshift-ci bot assigned sseago May 18, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2023

kaovilai approved these changes May 18, 2023

View reviewed changes

openshift-ci bot assigned kaovilai May 18, 2023

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 18, 2023

rebase

d14306e

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 19, 2023

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 19, 2023

shubham-pampattiwar approved these changes May 19, 2023

View reviewed changes

openshift-ci bot assigned shubham-pampattiwar May 19, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2023

shubham-pampattiwar mentioned this pull request May 19, 2023

OADP-1821: Add storageClass mapping for volumeOptions migtools/volume-snapshot-mover#221

Merged

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 19, 2023

Fix ProviderStorageClassName() relative path

df9357e

Signed-off-by: Tiger Kaovilai <[email protected]>

kaovilai force-pushed the sc-mapping branch from 16994fb to df9357e Compare May 19, 2023 17:58

kaovilai mentioned this pull request May 19, 2023

Update GCS dependencies and fix GCS driver distribution/distribution#3702

Closed

weshayutin merged commit 3a430a3 into openshift:master May 19, 2023

Conversation

eemcmullan commented May 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented May 15, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kaovilai May 16, 2023

Choose a reason for hiding this comment

Uh oh!

eemcmullan May 16, 2023

Choose a reason for hiding this comment

Uh oh!

sseago May 18, 2023

Choose a reason for hiding this comment

Uh oh!

eemcmullan commented May 16, 2023

Uh oh!

openshift-ci-robot commented May 17, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weshayutin commented May 17, 2023

Uh oh!

Uh oh!

kaovilai commented May 18, 2023

Uh oh!

shubham-pampattiwar commented May 18, 2023

Uh oh!

shubham-pampattiwar commented May 19, 2023

Uh oh!

openshift-ci bot commented May 19, 2023

Uh oh!

shubham-pampattiwar commented May 19, 2023

Uh oh!

shubham-pampattiwar commented May 19, 2023

Uh oh!

openshift-cherrypick-robot commented May 19, 2023

Uh oh!

eemcmullan commented May 19, 2023

Uh oh!

openshift-ci bot commented May 19, 2023

Uh oh!

weshayutin commented May 19, 2023

Uh oh!

openshift-ci bot commented May 19, 2023

Uh oh!

openshift-cherrypick-robot commented May 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

eemcmullan commented May 15, 2023 •

edited

Loading

openshift-ci-robot commented May 17, 2023 •

edited by openshift-ci bot

Loading