Minor fixes/cleanup on the okd-specific overlay (DNS conf, restart policy for ovsdb-server and /etc folder changes with ostree)

aleskandro commented 12 months ago

Hi, this PR proposes three commits to cleanup/refactor some of the okd-specific configuration.

Consolidate the DNS conf across NM, systemd-resolved, and coreDNS: in #527 and #163, we added some fixes for the DNS configuration, in particular, dns=none, the fix for the search . and the restore of the resolve.conf file after DNSStub is disabled in systemd-resolved. I'm proposing to change with:

the network manager dns configuration set to default and the rc-manager set to file
disable systemd-resolved at all
Removes the resolvconf dot and coreDNS services in favor of fix-resolveconf that replaces the /etc/resolv.conf symlink with an empty file before NetworkManager.service starts. NetworkManager will fulfill the plain resolv.conf content properly

The drop-in for ovsdb-server.service has a restart=always that seems unnecessary today as restart=on-failure is now set in the default unit and should cover the failures we need to take into account for fixing the ownership bits.

Along with the commits, I also moved some content from /etc to /usr/ as that seems more compliant with our intent, considering the three-way merge done by ostree against the host-specific conf set by users/operators in /etc vs system-specific content we want to default to.

openshift-ci[bot] commented 12 months ago

@aleskandro: The label(s) kind/refactor/cleanup cannot be applied, because the repository doesn't have them.

In response to [this](https://github.com/openshift/okd-machine-os/pull/693): >/hold > >/wip > >Just doing some tests on this after some digging on other work. I'm not sure we can onboard it easily. > >/kind refactor/cleanup Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

aleskandro commented 12 months ago

/test e2e-ovirt

aleskandro commented 12 months ago

/test e2e-vsphere

aleskandro commented 12 months ago

/test e2e-openstack

openshift-ci[bot] commented 12 months ago

@aleskandro: The specified target(s) for /test were not found. The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-gcp-upgrade
/test images

The following commands are available to trigger optional jobs:

/test e2e-aws-crun
/test e2e-gcp
/test e2e-ovirt
/test e2e-vsphere

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-okd-machine-os-master-e2e-aws-ovn
pull-ci-openshift-okd-machine-os-master-e2e-gcp-upgrade
pull-ci-openshift-okd-machine-os-master-images

In response to [this](https://github.com/openshift/okd-machine-os/pull/693#issuecomment-1809579172): >/test e2e-openstack Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

aleskandro commented 12 months ago

NetworkManager/resolved dns conf.

e2e-ovirt is not supported anymore
e2e-vsphere now drops a file in /etc/NetworkManager to setup
```
sh-5.2# cat /etc/NetworkManager/conf.d/99-vsphere.conf 
[main]
rc-manager=unmanaged
sh-5.2#              
```
this is compatible with the choice of having our file in /usr/lib/NetworkManager, overridden by this conf.

No search . is set there, and in general, KNI will take care of it.

e2e-aws-ovn seems fine
waiting for the upgrade on gcp.

openshift-ci[bot] commented 12 months ago

@aleskandro: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-vsphere	375a19ef5b61b232b915f77ff5187033fc130d24	link	false	`/test e2e-vsphere`
ci/prow/e2e-ovirt	375a19ef5b61b232b915f77ff5187033fc130d24	link	false	`/test e2e-ovirt`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).

aleskandro commented 12 months ago

e2e-gcp-upgrade passed too and the failures on vsphere seem unrelated to me:


: [sig-arch] Managed cluster should ensure control plane pods do not run in best-effort QoS [Suite:openshift/conformance/parallel] expand_more

: [sig-arch] Managed cluster should set requests but not limits [Suite:openshift/conformance/parallel] expand_more

I updated the description and upholding it for review.

/retitle Minor fixes/cleanup on the okd-specific overlay (DNS conf, restart policy for ovsdb-server and /etc folder changes with ostree)

aleskandro commented 12 months ago

/unhold

vrutkovs commented 12 months ago

/approve /lgtm

openshift-ci[bot] commented 12 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aleskandro, vrutkovs

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: - ~~[OWNERS](https://github.com/openshift/okd-machine-os/blob/master/OWNERS)~~ [vrutkovs] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

openshift / okd-machine-os

Minor fixes/cleanup on the okd-specific overlay (DNS conf, restart policy for ovsdb-server and /etc folder changes with ostree) #693