nameservers: Use nmcli to update the nameserver and search info #4145
Conversation
These helper function return string slice which is useful for next commit to use it with nmcli command.
pkg/crc/network/nameservers.go
Outdated
| err := sshRunner.CopyDataPrivileged([]byte(resolvFile), "/etc/resolv.conf", 0644) | ||
| if err != nil { | ||
| return fmt.Errorf("Error creating /etc/resolv on instance: %s", err.Error()) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func updateNetworkManagerConfig(sshRunner *ssh.Runner, nameservers, searchDomains string) error { | ||
| // When ovs-configuration service is running we are sure that name of the connection is ovs-if-br-ex | ||
| _, stderr, err := sshRunner.RunPrivileged("Update resolve.conf file", "nmcli", "con", "modify", "ovs-if-br-ex", |
There was a problem hiding this comment.
resolve.conf - typo
Is there a way of programmatically getting the name of the connection to use instead of hardcoding it?
There was a problem hiding this comment.
Is there a way of programmatically getting the name of the connection to use instead of hardcoding it?
I wish, I tried my search foo but didn't find anything. Let me know if you have some pointer, that would be great.
There was a problem hiding this comment.
Might be worth a nmcli conn show --active ovs-if-br-ex call first to ensure it exists?
There was a problem hiding this comment.
if it not exist then what would be our fallback? because if it not exist then if will anyway fails when adding the domain and nameserver .
There was a problem hiding this comment.
We could output a good error message instead of something possibly hard to understand.
From 4.15, because of ovn-kubernetes the info around nameserver and search option in the `/etc/resolv.conf` not match with user expectation. `ovs-configuration` service is run on this node which is a dependency for kubelet and this make changes in the networking by creating bridge network and restarting the NetworkManager. As soon as NM restart happen, changes which are done as part of crc vm post start are vanished. This PR is going to make sure that changes are done using `nmcli` and shouldn't removed when NM restart happen. Following steps are done in this PR - Start the `ovs-configuration` service, even it is enabled it doesn't autostart because it only required by `kubelet-dependencies.target`. - `ovs-configuration` service always create the network named as `ovs-if-br-ex` so we run the nmcli command to update this connection and add the nameserver and search option - Restart the NM to update the /etc/resolv.conf
It is renamed to UpdateResolvFileOnInstance. The resolv.conf file always present in the VM, this function just update it with user provided nameserver and our custom dnsmasq instance IP.
|
@praveenkumar: The following test 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cfergeau 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 |
| if err != nil { | ||
| return fmt.Errorf("failed to update resolv.conf file %s: %v", stderr, err) | ||
| } | ||
| return sd.Restart("NetworkManager.service") |
There was a problem hiding this comment.
/etc/resolv.conf update can also be achieved with nmcli conn up ovs-if-br-ex
From 4.15, because of ovn-kubernetes the info around nameserver and
search option in the
/etc/resolv.confnot match with user expectation.ovs-configurationservice is run on this node which is a dependencyfor kubelet and this make changes in the networking by creating bridge
network and restarting the NetworkManager. As soon as NM restart happen,
changes which are done as part of crc vm post start are vanished.
This PR is going to make sure that changes are done using
nmcliandshouldn't removed when NM restart happen. Following steps are done in
this PR
ovs-configurationservice, even it is enabled it doesn'tautostart because it only required by
kubelet-dependencies.target.ovs-configurationservice always create the network named asovs-if-br-exso we run the nmcli command to update this connectionand add the nameserver and search option
Fixes: Issue #4144