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

MGMT-16814: Use all cluster networks to determine IP family for ironic #6048

Merged
merged 1 commit into from Mar 6, 2024

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Mar 4, 2024

Before this, when deploying an IPv6 spoke from a dualstack hub only the machine network was being used to determine the address family of the spoke cluster.

This was an issue because the machine network is not generally set until after hosts are discovered.

This change uses all the cluster networks to determine the address family and should allow the preprovisioning image controller to correctly determine the IP family and set the ironic and inspector urls accordingly.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-16814

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

QE will test this fix fully before merge

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

Before this, when deploying an IPv6 spoke from a dualstack hub only the
machine network was being used to determine the address family of the
spoke cluster.

This was an issue because the machine network is not generally set until
after hosts are discovered.

This change uses all the cluster networks to determine the address
family and should allow the preprovisioning image controller to
correctly determine the IP family and set the ironic and inspector urls
accordingly.

Resolves https://issues.redhat.com/browse/MGMT-16814
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 4, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 4, 2024

@carbonin: This pull request references MGMT-16814 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

Before this, when deploying an IPv6 spoke from a dualstack hub only the machine network was being used to determine the address family of the spoke cluster.

This was an issue because the machine network is not generally set until after hosts are discovered.

This change uses all the cluster networks to determine the address family and should allow the preprovisioning image controller to correctly determine the IP family and set the ironic and inspector urls accordingly.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-16814

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

QE will test this fix fully before merge

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 4, 2024
@carbonin
Copy link
Member Author

carbonin commented Mar 4, 2024

Alternative to #6047

This doesn't handle the late-binding case, but doesn't require us to track and wait for fixes in OCP and is generally much less invasive.

cc @gamli75 @eranco74 @avishayt

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024
Copy link

codecov bot commented Mar 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.40%. Comparing base (ee0189b) to head (df22198).
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6048      +/-   ##
==========================================
+ Coverage   68.39%   68.40%   +0.01%     
==========================================
  Files         239      239              
  Lines       35454    35454              
==========================================
+ Hits        24248    24253       +5     
+ Misses       9100     9098       -2     
+ Partials     2106     2103       -3     
Files Coverage Δ
...ler/controllers/preprovisioningimage_controller.go 80.99% <100.00%> (ø)

... and 1 file with indirect coverage changes

@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

/test edge-subsystem-kubeapi-aws

2 similar comments
@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

/test edge-subsystem-kubeapi-aws

@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

/test edge-subsystem-kubeapi-aws

@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

This was confirmed to work by QE, @CrystalChun can you take a look at this one?

Copy link
Contributor

@CrystalChun CrystalChun left a comment

Choose a reason for hiding this comment

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

/lgtm

@CrystalChun
Copy link
Contributor

/override ci/prow/edge-e2e-ai-operator-disconnected-capi
Broken test depends on openshift/release#49079

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2024
Copy link

openshift-ci bot commented Mar 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin, CrystalChun

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:
  • OWNERS [CrystalChun,carbonin]

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

Copy link

openshift-ci bot commented Mar 5, 2024

@CrystalChun: Overrode contexts on behalf of CrystalChun: ci/prow/edge-e2e-ai-operator-disconnected-capi

In response to this:

/override ci/prow/edge-e2e-ai-operator-disconnected-capi
Broken test depends on openshift/release#49079

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.

@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

/hold

going to try to be more specific about ip families

@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 Mar 5, 2024
@carbonin
Copy link
Member Author

carbonin commented Mar 5, 2024

You know what ... never mind.
This bug is blocking MCE 2.5 so let's get the minimal fix in first and we can handle things like v6-primary clusters in a separate fix.

/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 Mar 5, 2024
Copy link

openshift-ci bot commented Mar 5, 2024

@carbonin: The following test 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-agent-compact-ipv4 df22198 link false /test e2e-agent-compact-ipv4

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.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 97daf5f and 2 for PR HEAD df22198 in total

@openshift-merge-bot openshift-merge-bot bot merged commit acad591 into openshift:master Mar 6, 2024
15 of 16 checks passed
@gamli75
Copy link
Contributor

gamli75 commented Mar 6, 2024

/cherry-pick release-ocm-2.10

@openshift-cherrypick-robot

@gamli75: new pull request created: #6057

In response to this:

/cherry-pick release-ocm-2.10

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

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.16.0-202403060709.p0.gacad591.assembly.stream.el8 for distgit ose-agent-installer-api-server.
All builds following this will include this PR.

@carbonin carbonin deleted the dual-stack-ironic-2 branch March 6, 2024 13:14
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. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants