Skip to content

Commit 3e54237

Browse files
authored
Merge pull request #76832 from stevsmit/OCPBUGS24361-nm-state
Ocpbugs24361 nm state
2 parents c7563af + 7a639b5 commit 3e54237

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

modules/virt-example-nmstate-IP-management.adoc

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,38 @@ By default, the `nmstate` API stores DNS values globally as against storing them
9898
Setting a DNS configuration is comparable to modifying the `/etc/resolv.conf` file.
9999
====
100100

101-
The following examples show situations that require configuring a network interface to store DNS values:
102-
103101
[IMPORTANT]
104102
====
105103
You cannot use `br-ex` bridge, an OVNKubernetes-managed Open vSwitch bridge, as the interface when configuring DNS resolvers.
106104
====
107105

108-
* Configure a static DNS for a network interface with an automatic IP configuration. Note that for this configuration, you must set the `auto-dns` parameter to `false`, so that the Kubernetes NMState Operator can store custom DNS settings for the network interface.
106+
The following example shows a default situation that stores DNS values globally:
107+
108+
* Configure a static DNS without a network interface. Note that when updating the `/etc/resolv.conf` file on a host node, you do not need to specify an interface (IPv4 or IPv6) in the `NodeNetworkConfigurationPolicy` (NNCP) manifest.
109+
+
110+
[source,yaml]
111+
----
112+
apiVersion: nmstate.io/v1
113+
kind: NodeNetworkConfigurationPolicy
114+
metadata:
115+
name: worker-0-dns-testing
116+
spec:
117+
nodeSelector:
118+
kubernetes.io/hostname: <target_node>
119+
dns-resolver:
120+
config:
121+
search:
122+
- example.com
123+
- example.org
124+
server:
125+
- 2001:db8:f::1
126+
- 192.0.2.251
127+
# ...
128+
----
129+
130+
The following examples show situations that require configuring a network interface to store DNS values:
131+
132+
* Configure a static DNS for a network interface with an automatic IP configuration. Note that for this configuration, you must set the `auto-dns` parameter to `false`, so that the Kubernetes NMState Operator can store custom DNS settings for the network interface.
109133
+
110134
[source,yaml]
111135
----
@@ -171,7 +195,7 @@ routes:
171195
# ...
172196
----
173197

174-
* Configure a static DNS name server to append to Dynamic Host Configuration Protocol (DHCP) and IPv6 Stateless Address AutoConfiguration (SLAAC) servers:
198+
* Configure a static DNS name server to append to Dynamic Host Configuration Protocol (DHCP) and IPv6 Stateless Address AutoConfiguration (SLAAC) servers.
175199
+
176200
[source,yaml]
177201
----

networking/ovn_kubernetes_network_provider/rollback-to-openshift-sdn.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ As a cluster administrator, you can rollback to the OpenShift SDN from the OVN-K
1010

1111
include::snippets/sdn-deprecation-statement.adoc[]
1212

13-
include::modules/nw-ovn-kubernetes-rollback.adoc[leveloffset=+1]
13+
include::modules/nw-ovn-kubernetes-rollback.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)