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

OCPBUGS-15910: After dual-stack conversion reconcile IPFamilies #3909

Merged
merged 1 commit into from Sep 22, 2023

Conversation

mkowalski
Copy link
Contributor

This PR introduces a missing reconciliation of IPFamilies property in the ControllerConfig. A consequence of the reconciliation missing is that after conversion from single-stack to dual-stack the kubelet is still configured as single-stack because the underlying MCO's variable does not change its value.

With this PR, when converting such a cluster, ControllerConfig will update the value and as a consequence reconfigure kubelet (specifically --node-ip param).

Please note with this change we are introducing one reboot to the process of cluster conversion.

Fixes: OCPBUGS-15910

This PR introduces a missing reconciliation of IPFamilies property in
the ControllerConfig. A consequence of the reconciliation missing is
that after conversion from single-stack to dual-stack the kubelet is
still configured as single-stack because the underlying MCO's variable
does not change its value.

With this PR, when converting such a cluster, ControllerConfig will
update the value and as a consequence reconfigure kubelet (specifically
`--node-ip` param).

Please note with this change we are introducing one reboot to the
process of cluster conversion.

Fixes: OCPBUGS-15910
@openshift-ci-robot openshift-ci-robot added 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 Sep 12, 2023
@openshift-ci-robot
Copy link
Contributor

@mkowalski: This pull request references Jira Issue OCPBUGS-15910, which is invalid:

  • expected the bug to target the "4.15.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.

In response to this:

This PR introduces a missing reconciliation of IPFamilies property in the ControllerConfig. A consequence of the reconciliation missing is that after conversion from single-stack to dual-stack the kubelet is still configured as single-stack because the underlying MCO's variable does not change its value.

With this PR, when converting such a cluster, ControllerConfig will update the value and as a consequence reconfigure kubelet (specifically --node-ip param).

Please note with this change we are introducing one reboot to the process of cluster conversion.

Fixes: OCPBUGS-15910

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 12, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 12, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@mkowalski
Copy link
Contributor Author

/test all

@cybertron
Copy link
Member

It's tricky to test this going from single to dual in a dev env, but I tested going from dual to single and it correctly updated the kubelet config and rebooted the nodes as it should.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2023
@mkowalski mkowalski marked this pull request as ready for review September 22, 2023 07:49
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 22, 2023
@mkowalski
Copy link
Contributor Author

/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 Sep 22, 2023
@openshift-ci-robot
Copy link
Contributor

@mkowalski: This pull request references Jira Issue OCPBUGS-15910, 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.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

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.

@mkowalski
Copy link
Contributor Author

/cc @sinnykumari

Copy link
Contributor

@sinnykumari sinnykumari left a comment

Choose a reason for hiding this comment

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

LGTM

@sinnykumari
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, mkowalski, sinnykumari

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 Sep 22, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 22, 2023

@mkowalski: all tests passed!

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-merge-robot openshift-merge-robot merged commit 164c801 into openshift:master Sep 22, 2023
13 checks passed
@openshift-ci-robot
Copy link
Contributor

@mkowalski: Jira Issue OCPBUGS-15910: All pull requests linked via external trackers have merged:

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

In response to this:

This PR introduces a missing reconciliation of IPFamilies property in the ControllerConfig. A consequence of the reconciliation missing is that after conversion from single-stack to dual-stack the kubelet is still configured as single-stack because the underlying MCO's variable does not change its value.

With this PR, when converting such a cluster, ControllerConfig will update the value and as a consequence reconfigure kubelet (specifically --node-ip param).

Please note with this change we are introducing one reboot to the process of cluster conversion.

Fixes: OCPBUGS-15910

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.

@mkowalski mkowalski deleted the OCPBUGS-15910 branch September 22, 2023 13:25
@mkowalski
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@mkowalski: new pull request created: #3934

In response to this:

/cherry-pick release-4.14

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.

@mkowalski
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@mkowalski: #3909 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-15910: After dual-stack conversion reconcile IPFamilies
Using index info to reconstruct a base tree...
M	lib/resourcemerge/machineconfig.go
Falling back to patching base and 3-way merge...
Auto-merging lib/resourcemerge/machineconfig.go
CONFLICT (content): Merge conflict in lib/resourcemerge/machineconfig.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-15910: After dual-stack conversion reconcile IPFamilies
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.13

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.

mkowalski added a commit to mkowalski/machine-config-operator that referenced this pull request Sep 22, 2023
This PR introduces a missing reconciliation of IPFamilies property in
the ControllerConfig. A consequence of the reconciliation missing is
that after conversion from single-stack to dual-stack the kubelet is
still configured as single-stack because the underlying MCO's variable
does not change its value.

With this PR, when converting such a cluster, ControllerConfig will
update the value and as a consequence reconfigure kubelet (specifically
`--node-ip` param).

Please note with this change we are introducing one reboot to the
process of cluster conversion.

Fixes: OCPBUGS-15910
Cherry-picks: openshift#3909
mkowalski added a commit to mkowalski/machine-config-operator that referenced this pull request Sep 22, 2023
This PR introduces a missing reconciliation of IPFamilies property in
the ControllerConfig. A consequence of the reconciliation missing is
that after conversion from single-stack to dual-stack the kubelet is
still configured as single-stack because the underlying MCO's variable
does not change its value.

With this PR, when converting such a cluster, ControllerConfig will
update the value and as a consequence reconfigure kubelet (specifically
`--node-ip` param).

Please note with this change we are introducing one reboot to the
process of cluster conversion.

Fixes: OCPBUGS-15910
Cherry-picks: openshift#3909
mkowalski added a commit to mkowalski/machine-config-operator that referenced this pull request Sep 22, 2023
This PR introduces a missing reconciliation of IPFamilies property in
the ControllerConfig. A consequence of the reconciliation missing is
that after conversion from single-stack to dual-stack the kubelet is
still configured as single-stack because the underlying MCO's variable
does not change its value.

With this PR, when converting such a cluster, ControllerConfig will
update the value and as a consequence reconfigure kubelet (specifically
`--node-ip` param).

Please note with this change we are introducing one reboot to the
process of cluster conversion.

Fixes: OCPBUGS-15910
Cherry-picks: openshift#3909
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-09-27-073353

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-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.

None yet

6 participants