Skip to content

OCPBUGS-35406: Use service CIDRs to determine bootstrap kubelet IP family#8681

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
danwinship:bootstrap-node-ip
Jul 22, 2024
Merged

OCPBUGS-35406: Use service CIDRs to determine bootstrap kubelet IP family#8681
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
danwinship:bootstrap-node-ip

Conversation

@danwinship
Copy link
Copy Markdown
Contributor

#4756 used the apiVIPs to decide whether to make the bootstrap kubelet be prefer-ipv4 or prefer-ipv6, but that won't work if the apiVIPs aren't specified. The validation already ensures that all of the fields that are specified agree about the primary IP family, so we can just switch to using one of the required config values instead of an optional one.

/cc @celebdor @staebler

The bootstrap kubelet needs to pick a node IP of the cluster's primary
IP family (to ensure that the bootstrap apiserver will advertise an IP
of that family, matching the family of the kubernetes.default
service).

Previously it was doing this based on the apiVIPs, but those may not
be defined in the install-config for UPI. Instead, base it on the
service CIDR. (The install-config validation ensures that all of the
values that *are* specified agree on the IP families, so this will
still pick the same family as the old code did when apiVIPs is
specified.)
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 28, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@danwinship: This pull request references Jira Issue OCPBUGS-35406, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

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.

Details

In response to this:

#4756 used the apiVIPs to decide whether to make the bootstrap kubelet be prefer-ipv4 or prefer-ipv6, but that won't work if the apiVIPs aren't specified. The validation already ensures that all of the fields that are specified agree about the primary IP family, so we can just switch to using one of the required config values instead of an optional one.

/cc @celebdor @staebler

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 requested a review from celebdor June 28, 2024 20:16
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 28, 2024

@danwinship: GitHub didn't allow me to request PR reviews from the following users: staebler.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

#4756 used the apiVIPs to decide whether to make the bootstrap kubelet be prefer-ipv4 or prefer-ipv6, but that won't work if the apiVIPs aren't specified. The validation already ensures that all of the fields that are specified agree about the primary IP family, so we can just switch to using one of the required config values instead of an optional one.

/cc @celebdor @staebler

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-sigs/prow repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 28, 2024

@danwinship: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@r4f4
Copy link
Copy Markdown
Contributor

r4f4 commented Jul 2, 2024

/assign @patrickdillon

Copy link
Copy Markdown
Contributor

@r4f4 r4f4 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 openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2024
@cybertron
Copy link
Copy Markdown
Member

/lgtm

For reference, we used similar logic in CEO for this: openshift/cluster-etcd-operator#1012

@r4f4
Copy link
Copy Markdown
Contributor

r4f4 commented Jul 3, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 3, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-35406, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact:
/cc @wangke19

Details

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

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 3, 2024
@openshift-ci openshift-ci Bot requested a review from wangke19 July 3, 2024 06:57
@danwinship
Copy link
Copy Markdown
Contributor Author

For reference, we used similar logic in CEO for this: openshift/cluster-etcd-operator#1012

Likewise, when not using nodeip-configuration, MCO uses the service CIDRs to decide whether to tell kubelet to use IPv4 or IPv6: https://github.com/openshift/machine-config-operator/pull/1381/files

@patrickdillon
Copy link
Copy Markdown
Contributor

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 01b922e and 2 for PR HEAD 032c091 in total

@openshift-merge-bot openshift-merge-bot Bot merged commit 26885d1 into openshift:master Jul 22, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@danwinship: Jira Issue OCPBUGS-35406: All pull requests linked via external trackers have merged:

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

Details

In response to this:

#4756 used the apiVIPs to decide whether to make the bootstrap kubelet be prefer-ipv4 or prefer-ipv6, but that won't work if the apiVIPs aren't specified. The validation already ensures that all of the fields that are specified agree about the primary IP family, so we can just switch to using one of the required config values instead of an optional one.

/cc @celebdor @staebler

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

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-altinfra
This PR has been included in build ose-installer-altinfra-container-v4.17.0-202407222110.p0.g26885d1.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.17.0-202407222110.p0.g26885d1.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-terraform-providers
This PR has been included in build ose-installer-terraform-providers-container-v4.17.0-202407222110.p0.g26885d1.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.17.0-202407222110.p0.g26885d1.assembly.stream.el9.
All builds following this will include this PR.

@danwinship danwinship deleted the bootstrap-node-ip branch August 5, 2024 13:01
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/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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

Development

Successfully merging this pull request may close these issues.

6 participants