Skip to content

bug 1857175: Let webhook only set clusterID label if it does not exist#653

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
enxebre:followup-1857175
Jul 22, 2020
Merged

bug 1857175: Let webhook only set clusterID label if it does not exist#653
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
enxebre:followup-1857175

Conversation

@enxebre
Copy link
Copy Markdown
Member

@enxebre enxebre commented Jul 22, 2020

This enabled webhooks to enforce the clusterID labels on machineSet/machine creation #644.
To avoid any difficult to predict side effect we want to honour any existing value that is already set on existing resources.

@enxebre
Let webhook only set clusterID label if it does not exist
4fe7afb 
This enabled webhooks to enforce the clusterID labels on machineSet/machine creation openshift#644.
To avoid any difficult to predict side effect we want to honour any existing value that is already set on existing resources.
@enxebre enxebre changed the title Let webhook only set clusterID label if it does not exist bug 1857175: Let webhook only set clusterID label if it does not exist Jul 22, 2020
@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 Jul 22, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jul 22, 2020

@enxebre: This pull request references Bugzilla bug 1857175, 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.6.0) matches configured target release for branch (4.6.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 1857175: Let webhook only set clusterID label if it does not exist

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 22, 2020
JoelSpeed
JoelSpeed reviewed Jul 22, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jul 22, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2020
@openshift-ci-robot openshift-ci-robot mentioned this pull request Jul 22, 2020
Merged
alexander-demicev
alexander-demicev approved these changes Jul 22, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2020
@enxebre
Copy link
Copy Markdown
Member Author

enxebre commented Jul 22, 2020

/retest

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2020

/retest

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

This was referenced Jul 22, 2020
Merged
Merged
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2020

/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

openshift-bot commented Jul 22, 2020

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2020

/retest

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

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jul 22, 2020 •
edited
Loading

@enxebre: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure-operator 4fe7afb link /test e2e-azure-operator

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-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jul 22, 2020

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 6d61ac4 into openshift:master Jul 22, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jul 22, 2020

@enxebre: Some pull requests linked via external trackers have merged: openshift/machine-api-operator#653, openshift/machine-api-operator#644, openshift/cluster-api-provider-gcp#106. The following pull requests linked via external trackers have not merged:

Details

In response to this:

bug 1857175: Let webhook only set clusterID label if it does not exist

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 mentioned this pull request Jul 22, 2020
Merged
enxebre added a commit to enxebre/machine-api-operator that referenced this pull request Jul 27, 2020
@enxebre
Set default clusterID labels only on machine
ba3f450 
This tries to fix the following scenario:
We set ms.Spec.Selector.MatchLabels[MachineClusterIDLabel] if it's not present. It's not present and we set it to the correct value. If there happens to be a bad label in `ms.Spec.Template.Labels` this would result in a miss match.

Follow for
openshift#608,
openshift#644 and
openshift#653.
@enxebre enxebre mentioned this pull request Jul 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JoelSpeed JoelSpeed JoelSpeed left review comments

@Danil-Grigorev Danil-Grigorev Awaiting requested review from Danil-Grigorev

+1 more reviewer

@alexander-demicev alexander-demicev alexander-demicev approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@alexander-demicev alexander-demicev

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@enxebre @openshift-ci-robot @openshift-bot @JoelSpeed @alexander-demicev @openshift-merge-robot