Skip to content

OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector #1816

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
Merged
merged 6 commits into from
Jun 22, 2023
Merged

OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector #1816

merged 6 commits into from
Jun 22, 2023

Conversation

kyrtapz
Copy link
Contributor

@kyrtapz kyrtapz commented May 22, 2023 •
edited
Loading

This is a clean backport of #1802.
The change is the first commit bumping the hypershift dependency, this was requried since we use different dependencies in 4.12 and 4.13.

Additionally this PR cherry-picks: ff5d378

/cc @jcaamano @martinkennelly

@openshift-ci openshift-ci bot requested review from jcaamano and martinkennelly May 22, 2023 12:15
@kyrtapz
Copy link
Contributor Author

kyrtapz commented May 22, 2023

/jira cherrypick OCPBUGS-13155

@openshift-ci-robot
Copy link
Contributor

@kyrtapz: Jira Issue OCPBUGS-13155 has been cloned as Jira Issue OCPBUGS-13891. Will retitle bug to link to clone.
/retitle OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector

In response to this:

/jira cherrypick OCPBUGS-13155

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 changed the title [release-4.12] HyperShift: Support HostedControlPlane node selector OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector May 22, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 22, 2023
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: This pull request references Jira Issue OCPBUGS-13891, which is invalid:

  • expected dependent Jira Issue OCPBUGS-13155 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA instead

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is a clean backport of #1802.
The only change is the first commit bumping the hypershift dependency, this was requried since we use different dependencies in 4.12 and 4.13.

/cc @jcaamano @martinkennelly

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 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 22, 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 May 24, 2023
@kyrtapz kyrtapz force-pushed the hcp_nodeselector_412 branch from 37228f3 to 883e0c7 Compare May 29, 2023 11:38
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 29, 2023
kyrtapz and others added 5 commits May 29, 2023 13:39
@kyrtapz
Bump hypershift dependency to v0.1.2
9049a76 
Manually modified hypershift version in go.mod to bump
the dependency without introducing dependency conflicts.
Additionally adapted replace section.

Signed-off-by: Patryk Diak <[email protected]>
@martinkennelly @kyrtapz
Migrate to hypershift v1beta1
667e48d 
Signed-off-by: Martin Kennelly <[email protected]>
(cherry picked from commit 4cc44a6)
@kyrtapz
HyperShift: Move hypershift.go to platform package
d40981b 
This commit doesn't introduce functional changes.
Move hypershift.go to platform package to avoid circural dependencies in following commits.

Signed-off-by: Patryk Diak <[email protected]>
(cherry picked from commit cc53553)
@kyrtapz
HyperShift: Retrieve HostedControlPlane as part of bootstrap process
a5c7bc7 
This commit doesn't introduce any functional changes.
ovn-kubernetes is no longer the only component that requiress access to the details of HostedControlPlane cr.
Make HostedControlPlane retrieval a part of InfraStatus so it is only done once per reconcilation.

Signed-off-by: Patryk Diak <[email protected]>
(cherry picked from commit 8a50244)
@kyrtapz
HyperShift: Add support for HostedControlPlane nodeSelector field
6ad1fce 
Signed-off-by: Patryk Diak <[email protected]>
(cherry picked from commit 62abd8e)
@kyrtapz kyrtapz force-pushed the hcp_nodeselector_412 branch from 883e0c7 to 6ad1fce Compare May 29, 2023 11:40
@kyrtapz
Copy link
Contributor Author

kyrtapz commented May 31, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 31, 2023
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: This pull request references Jira Issue OCPBUGS-13891, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-13155 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-13155 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/jira 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 openshift-ci bot requested a review from anuragthehatter May 31, 2023 17:32
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jun 1, 2023

/retest

jcaamano
jcaamano reviewed Jun 2, 2023
View reviewed changes
This was referenced Jun 5, 2023
Closed
Merged
@csrwng
Copy link
Contributor

csrwng commented Jun 7, 2023 •
edited
Loading

/hold
until this is fixed: https://issues.redhat.com/browse/OCPBUGS-14714

@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 Jun 7, 2023
@jeffnowicki
Copy link

/hold until this is fixed: https://issues.redhat.com/browse/OCPBUGS-14476

@csrwng this is the issue/bug you intended to reference: https://issues.redhat.com/browse/OCPBUGS-14714

@kyrtapz
Do not determine if HyperShift is enabled based on the ControlPlaneTo…
4e7b1b5 
…pology value

When the ControlPlaneTopology is set to External it does not always mean that HyperShift is also enabled.
Instead of relying on ControlPlaneTopology value, always check if HyperShift is specifically enabled.

Signed-off-by: Patryk Diak <[email protected]>
(cherry picked from commit ff5d378)
@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 Jun 20, 2023
@celebdor
Copy link

celebdor commented Jun 20, 2023 •
edited
Loading

/hold
The backport to 4.13 is not yet merged #1837

@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 Jun 20, 2023
@enxebre
Copy link
Member

enxebre commented Jun 21, 2023

both holds have been resolved now.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2023
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jun 21, 2023

/retest

@jcaamano
Copy link
Contributor

/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 21, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, jcaamano, kyrtapz

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 Jun 21, 2023
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jun 21, 2023

/retest-required

@asood-rh
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 21, 2023
@muraee muraee mentioned this pull request Jun 21, 2023
Merged
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 21, 2023

@kyrtapz: The following tests 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/e2e-network-mtu-migration-ovn-ipv4 4e7b1b5 link false /test e2e-network-mtu-migration-ovn-ipv4
ci/prow/e2e-openstack-sdn 4e7b1b5 link false /test e2e-openstack-sdn

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.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Jun 22, 2023

/hold cancel

@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 Jun 22, 2023
@openshift-merge-robot openshift-merge-robot merged commit 88b5720 into openshift:release-4.12 Jun 22, 2023
@openshift-ci-robot
Copy link
Contributor

@kyrtapz: Jira Issue OCPBUGS-13891: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-13891 has been moved to the MODIFIED state.

In response to this:

This is a clean backport of #1802.
The change is the first commit bumping the hypershift dependency, this was requried since we use different dependencies in 4.12 and 4.13.

Additionally this PR cherry-picks: ff5d378

/cc @jcaamano @martinkennelly

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.12.0-0.nightly-2023-06-22-210741

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

@jcaamano jcaamano jcaamano left review comments

@martinkennelly martinkennelly Awaiting requested review from martinkennelly

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

Assignees

@mffiedler mffiedler

@enxebre enxebre

@rbbratta rbbratta

@eurijon eurijon

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@rlobillo rlobillo

@asood-rh asood-rh

@jechen0648 jechen0648

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.