Skip to content

Bug 1910581: CSO shouldn't overwrite clustercsidriver objects#131

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
bertinatto:fix-cr-race-configobserver
Jan 21, 2021
Merged

Bug 1910581: CSO shouldn't overwrite clustercsidriver objects#131
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
bertinatto:fix-cr-race-configobserver

Conversation

@bertinatto
Copy link
Copy Markdown
Member

@bertinatto bertinatto commented Jan 19, 2021

With this PR CSO will no longer update/patch the CR.

If the CR doesn't exist, CSO will create it. However, if the already CR exists, CSO won't update it with the config that it sees fit.

This is a requirement for the CSI Config Observer Controller used in CSI driver operators. That controller watches proxies resources and writes the observed config in CR.Spec.observedConfig. Without this PR, CSO would overwrite that field.

CC @openshift/storage

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Jan 19, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bertinatto: This pull request references Bugzilla bug 1912945, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1912945: CSO shouldn't overwrite clustercsidriver resources

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-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 19, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2021
@bertinatto
Copy link
Copy Markdown
Member Author

/wip
Still checking if this patch fixes the issue.

@bertinatto bertinatto changed the title Bug 1912945: CSO shouldn't overwrite clustercsidriver resources Bug 1912945: CSO shouldn't overwrite clustercsidriver objects Jan 19, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bertinatto: This pull request references Bugzilla bug 1912945, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1912945: CSO shouldn't overwrite clustercsidriver objects

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.

@bertinatto
Copy link
Copy Markdown
Member Author

/wip cancel

@bertinatto
Copy link
Copy Markdown
Member Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 19, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bertinatto: This pull request references Bugzilla bug 1912945, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

/bugzilla refresh

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-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 19, 2021
@bertinatto
Copy link
Copy Markdown
Member Author

/retest

@bertinatto bertinatto changed the title Bug 1912945: CSO shouldn't overwrite clustercsidriver objects Bug 1910581: CSO shouldn't overwrite clustercsidriver objects Jan 19, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bertinatto: This pull request references Bugzilla bug 1910581, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1910581: CSO shouldn't overwrite clustercsidriver objects

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.

@bertinatto
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@bertinatto
Copy link
Copy Markdown
Member Author

/retest

modified := resourcemerge.BoolPtr(false)
existingCopy := existing.DeepCopy()

resourcemerge.EnsureObjectMeta(modified, &existingCopy.ObjectMeta, required.ObjectMeta)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we might want to merge metadata of an object in-case there are some cluster-wide annotations applied to these CRs, but if we come to that we can also push and update and do metadata merging later on (so I am bit torn).

@gnufied
Copy link
Copy Markdown
Member

gnufied commented Jan 21, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, gnufied

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:

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

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 1842b2a into openshift:master Jan 21, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@bertinatto: All pull requests linked via external trackers have merged:

Bugzilla bug 1910581 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1910581: CSO shouldn't overwrite clustercsidriver objects

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants