Skip to content
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

Jump to bottom

fix: OADP-2688 Always check restore resource priorities #1139

Merged
merged 1 commit into from Sep 11, 2023
Merged

fix: OADP-2688 Always check restore resource priorities #1139

merged 1 commit into from Sep 11, 2023

Conversation

mateusoliveira43
Copy link
Contributor

Address Tiger's comment #1132 (comment)

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 25, 2023
@openshift-ci
Copy link

openshift-ci bot commented Aug 25, 2023

Hi @mateusoliveira43. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci openshift-ci bot requested review from kaovilai and sseago August 25, 2023 12:08
sseago
sseago requested changes Aug 25, 2023
View reviewed changes
Copy link
Contributor

@sseago sseago left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my other comment for where I think the change here needs to be, but if Args is nil, we need to set it to a non-nil value first before attempting to set a value of one of its components.

@shawn-hurley
Copy link
Contributor

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 25, 2023
sseago
sseago requested changes Aug 25, 2023
View reviewed changes
api/v1alpha1/oadp_types.go Outdated Show resolved Hide resolved
sseago
sseago previously approved these changes Aug 25, 2023
View reviewed changes
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2023
@sseago
Copy link
Contributor

sseago commented Aug 25, 2023

/cherry-pick oadp-1.2
/cherry-pick oadp-1.1

@mateusoliveira43
Copy link
Contributor Author

Checked CI logs, for unit tests, the error seems to be the update adding the restore priority. Expected

"server", "--fs-backup-timeout=1h", "--log-level", "info", "--item-operation-sync-frequency=5m", "--default-item-operation-timeout=2h"

Got (but why 2 log level flags?)

"server", "--log-level=info", "--fs-backup-timeout=1h0m0s", "--restore-resource-priorities=securitycontextconstraints,customresourcedefinitions,namespaces,storageclasses,volumesnapshotclass.snapshot.storage.k8s.io,volumesnapshotcontents.snapshot.storage.k8s.io,volumesnapshots.snapshot.storage.k8s.io,datauploads.velero.io,persistentvolumes,persistentvolumeclaims,serviceaccounts,secrets,configmaps,limitranges,pods,replicasets.apps,clusterclasses.cluster.x-k8s.io,endpoints,services,-,clusterbootstraps.run.tanzu.vmware.com,clusters.cluster.x-k8s.io,clusterresourcesets.addons.cluster.x-k8s.io", "--log-level", "info", "--item-operation-sync-frequency=5m", "--default-item-operation-timeout=2h"

For E2E, I did not figured out the problem.

Can we update the unit tests? (if yes, where do I update them?)

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2023
mateusoliveira43
mateusoliveira43 commented Aug 28, 2023
View reviewed changes
controllers/velero_test.go
@@ -2494,8 +2520,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
}
}
if !reflect.DeepEqual(tt.wantVeleroDeployment, tt.veleroDeployment) {
fmt.Println(cmp.Diff(tt.wantVeleroDeployment, tt.veleroDeployment))
t.Errorf("expected velero deployment spec to be \n%#v, got \n%#v", tt.wantVeleroDeployment, tt.veleroDeployment)
t.Errorf("expected velero deployment spec to be \n%#v, got \n%#v\nDIFF:%v", tt.wantVeleroDeployment, tt.veleroDeployment, cmp.Diff(tt.wantVeleroDeployment, tt.veleroDeployment))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed here because was easier to fix the tests passing the diff after (I was running with make tests)

sseago
sseago previously approved these changes Aug 28, 2023
View reviewed changes
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2023
@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 29, 2023
kaovilai
kaovilai requested changes Aug 29, 2023
View reviewed changes
api/v1alpha1/oadp_types.go Outdated Show resolved Hide resolved
@mateusoliveira43
Copy link
Contributor Author

/hold
Apply Tiger's changes
Wait Scott's PR

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 30, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 30, 2023
@mateusoliveira43
Copy link
Contributor Author

/retest

@weshayutin weshayutin changed the title fix: OADP-2094 Always check restore resource priorities fix: OADP-2688 Always check restore resource priorities Sep 5, 2023
@weshayutin
Copy link
Contributor

@mateusoliveira43 updated the oadp ticket to a cloned jira issue targeted for 1.3.0
since this is merging to master. https://issues.redhat.com/browse/OADP-2688

@mateusoliveira43
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2023
@weshayutin weshayutin added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2023
kaovilai
kaovilai previously approved these changes Sep 8, 2023
View reviewed changes
@shawn-hurley
Copy link
Contributor

/lgtm visack

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 32f2381 and 2 for PR HEAD 7d48fcf in total

@openshift-ci openshift-ci bot removed lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 8, 2023
@mateusoliveira43
fix: OADP-2094 Always check restore resource priorities
57a7918 
Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>
@mateusoliveira43
Copy link
Contributor Author

/retest

1 similar comment
@mateusoliveira43
Copy link
Contributor Author

/retest

@openshift-ci
Copy link

openshift-ci bot commented Sep 10, 2023

@mateusoliveira43: all tests passed!

Full PR test history. Your PR dashboard.

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.

@weshayutin
Copy link
Contributor

/approve

@kaovilai
Copy link
Member

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Sep 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mateusoliveira43, weshayutin

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 11, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2023
@openshift-merge-robot openshift-merge-robot merged commit cfa9086 into openshift:master Sep 11, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shawn-hurley shawn-hurley shawn-hurley left review comments

@weshayutin weshayutin weshayutin approved these changes

@kaovilai kaovilai kaovilai approved these changes

@sseago sseago sseago left review comments

@shubham-pampattiwar shubham-pampattiwar shubham-pampattiwar left review comments

Assignees

@kaovilai kaovilai

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@mateusoliveira43 @shawn-hurley @sseago @weshayutin @openshift-ci-robot @kaovilai @shubham-pampattiwar @openshift-merge-robot