RFE-2962: Set interface name from node-ip-configuration to configure-ovs #183
Conversation
node-ip-configuration will set env file for configure-ovs when it will set kubelet ip, this will allow to configure ovs with the bridge on the same interface that kubelet will use
|
/test all |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
|
/cc @cybertron |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: tsorya The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| crioSvcOverridePath = "/etc/systemd/system/crio.service.d/20-nodenet.conf" | ||
| kubeletSvcOverridePath = "/etc/systemd/system/kubelet.service.d/20-nodenet.conf" | ||
| crioSvcOverridePath = "/etc/systemd/system/crio.service.d/20-nodenet.conf" | ||
| ovsConfigurationSvcOverridePath = "/etc/systemd/system/ovs-configuration.service.d//20-nodenet.conf" |
|
@tsorya: The following tests failed, say
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. |
| log.Infof("Writing CRI-O service override with content %s", cOverrideContent) | ||
| _, err = cOverride.WriteString(cOverrideContent) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // OVN | ||
| // Set kubelet interface in case it is not br-ex that means that it was already configured and node is rebooting |
There was a problem hiding this comment.
Extra space in "already configured"
| // OVN | ||
| // Set kubelet interface in case it is not br-ex that means that it was already configured and node is rebooting | ||
| // in that case don't change the previous written interface | ||
| if chosenAddresses[0].LinkName != "br-ex" { |
There was a problem hiding this comment.
"br-ex" a candidate for const?
| // in that case don't change the previous written interface | ||
| if chosenAddresses[0].LinkName != "br-ex" { | ||
| ovsConfigurationDir := filepath.Dir(ovsConfigurationSvcOverridePath) | ||
| err = os.MkdirAll(ovsConfigurationDir, 0755) |
There was a problem hiding this comment.
Should we check if the dir exists and avoid getting an error creating it?
| // OVN | ||
| // Set kubelet interface in case it is not br-ex that means that it was already configured and node is rebooting | ||
| // in that case don't change the previous written interface | ||
| if chosenAddresses[0].LinkName != "br-ex" { |
There was a problem hiding this comment.
from line 144 until 160 could be converted to a helper function?
|
it was decided to go with ip address and not setting interface |
node-ip-configuration will set env file for configure-ovs when it will
set kubelet ip, this will allow to configure ovs with the bridge on the
same interface that kubelet will use
unitests were not fixed, will do it if we decide this idea is good to go
openshift/machine-config-operator#3222