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.

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

Bug 1992592: Atomic List Type #1028

Merged
merged 1 commit into from
Oct 14, 2021

Conversation

EmilyM1
Copy link
Contributor

@EmilyM1 EmilyM1 commented Oct 12, 2021

Making list atomic to prevent GitOps overwrite

@openshift-ci openshift-ci bot requested review from bparees and eparis October 12, 2021 21:04
@EmilyM1 EmilyM1 changed the title bug 1992592 - Atomic List Type #1027 bug 1992592 - Atomic List Type Oct 12, 2021
@@ -31,6 +31,7 @@ type OAuthSpec struct {
// identityProviders is an ordered list of ways for a user to identify themselves.
// When this list is empty, no identities are provisioned for users.
// +optional
// listType=atomic
Copy link

Choose a reason for hiding this comment

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

It's a tag, so it should be // +listType=atomic

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ty!

Copy link
Contributor

Choose a reason for hiding this comment

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

I totally miss a discussion why atomic is correct here. I doubt it is.

Copy link
Contributor

Choose a reason for hiding this comment

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

"Making list atomic to prevent GitOps overwrite" – atomic enforces exactly that: overwrite.

@soltysh
Copy link

soltysh commented Oct 13, 2021

/retitle Bug 1992592: Atomic List Type

@openshift-ci openshift-ci bot changed the title bug 1992592 - Atomic List Type Bug 1992592: Atomic List Type Oct 13, 2021
@openshift-ci openshift-ci bot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Oct 13, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 13, 2021

@EmilyM1: This pull request references Bugzilla bug 1992592, which is invalid:

  • expected the bug to target the "4.10.0" release, but it targets "---" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED 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.

In response to this:

Bug 1992592: Atomic List Type

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Oct 13, 2021
@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Oct 13, 2021

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 13, 2021

@EmilyM1: This pull request references Bugzilla bug 1992592, which is invalid:

  • expected the bug to target the "4.10.0" release, but it targets "---" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED 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.

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.

@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Oct 13, 2021

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Oct 13, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 13, 2021

@EmilyM1: This pull request references Bugzilla bug 1992592, which is valid. 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.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (liyao@redhat.com), skipping review request.

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.

Copy link

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 14, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilyM1, soltysh

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 Oct 14, 2021
@openshift-merge-robot openshift-merge-robot merged commit be2a7fb into openshift:master Oct 14, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 14, 2021

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

Bugzilla bug 1992592 has been moved to the MODIFIED state.

In response to this:

Bug 1992592: Atomic List Type

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.

@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Oct 18, 2021

/cherry-pick release-4.9

@openshift-cherrypick-robot

@EmilyM1: new pull request created: #1036

In response to this:

/cherry-pick release-4.9

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.

@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Oct 27, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot

@EmilyM1: #1028 failed to apply on top of branch "release-4.8":

Applying: add atomic listType
Using index info to reconstruct a base tree...
M	config/v1/0000_10_config-operator_01_oauth.crd.yaml
M	config/v1/types_oauth.go
Falling back to patching base and 3-way merge...
Auto-merging config/v1/types_oauth.go
Auto-merging config/v1/0000_10_config-operator_01_oauth.crd.yaml
CONFLICT (content): Merge conflict in config/v1/0000_10_config-operator_01_oauth.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add atomic listType
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".

In response to this:

/cherry-pick release-4.8

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.

@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Nov 10, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot

@EmilyM1: #1028 failed to apply on top of branch "release-4.8":

Applying: add atomic listType
Using index info to reconstruct a base tree...
M	config/v1/0000_10_config-operator_01_oauth.crd.yaml
M	config/v1/types_oauth.go
Falling back to patching base and 3-way merge...
Auto-merging config/v1/types_oauth.go
Auto-merging config/v1/0000_10_config-operator_01_oauth.crd.yaml
CONFLICT (content): Merge conflict in config/v1/0000_10_config-operator_01_oauth.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add atomic listType
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".

In response to this:

/cherry-pick release-4.8

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.

@EmilyM1
Copy link
Contributor Author

EmilyM1 commented Dec 23, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot

@EmilyM1: #1028 failed to apply on top of branch "release-4.8":

Applying: add atomic listType
Using index info to reconstruct a base tree...
M	config/v1/0000_10_config-operator_01_oauth.crd.yaml
M	config/v1/types_oauth.go
Falling back to patching base and 3-way merge...
Auto-merging config/v1/types_oauth.go
Auto-merging config/v1/0000_10_config-operator_01_oauth.crd.yaml
CONFLICT (content): Merge conflict in config/v1/0000_10_config-operator_01_oauth.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add atomic listType
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".

In response to this:

/cherry-pick release-4.8

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.

pierreprinetti added a commit to shiftstack/api that referenced this pull request May 2, 2022
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-low Referenced Bugzilla bug's severity is low 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