Update "runtimecfg node-ip" for dual-stack #110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
and remove unused GetFirstAddr function
openshift-ci-robot
added
the
do-not-merge/work-in-progress
danwinship
force-pushed
the
dual-stack-addresses
branch
from
503d73c
to
0bf7c6e
Compare
danwinship
force-pushed
the
dual-stack-addresses
branch
2 times, most recently
from
4c61df9
to
696e218
Compare
When "runtimecfg node-ip" is called on a node with dual-stack IPs, set "KUBELET_NODE_IPS=<primary-ip>,<secondary-ip>" (in addition to still setting KUBELET_NODE_IP to the primary IP). On single-stack nodes, we also set KUBELET_NODE_IPS, but it's identical to KUBELET_NODE_IP. (Doing things this way makes it easier to consume the output from a systemd service file in MCO.)
danwinship
force-pushed
the
dual-stack-addresses
branch
from
696e218
to
83d05af
Compare
danwinship
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
MCO change is openshift/machine-config-operator#2277, and this is now tested. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cybertron, danwinship 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 |
openshift-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In kube 1.20 you can pass two IPs to
kubelet --node-ip, but we still need help from runtimecfg to find the right IPs.First commit is just a reorg, second commit adds unit tests without changing functionality, and then the third commit changes the utils functions to return dual-stack answers and changes runtimecfg to make use of it. (Previously the utils functions returned multiple IPs of the same family but the caller only ever used the first value, so this just changes it to return only that first value, plus a second value of the opposite family.)
(I still need to write the corresponding MCO change and test it all...)