Skip to content

Commit 8fbccb6

Browse files
authored
Merge pull request #55086 from jldohmann/GH-52639
remove ign version logic
2 parents 9d072ca + 54b1f23 commit 8fbccb6

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

modules/configuring-ovs-log-level-permanently.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
:ign-config-version: 3.1.0
2-
ifeval::[{product-version} > 4.6]
3-
:ign-config-version: 3.2.0
4-
endif::[]
1+
// Module included in the following assemblies:
2+
//
3+
// * support/troubleshooting/troubleshooting-network-issues.adoc
54

65
:_content-type: PROCEDURE
76
[id="configuring-ovs-log-level-permanently_{context}"]
@@ -30,7 +29,7 @@ metadata:
3029
spec:
3130
config:
3231
ignition:
33-
version: {ign-config-version}
32+
version: 3.2.0
3433
systemd:
3534
units:
3635
- dropins:

modules/nw-how-nw-iface-selected.adoc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
// Applies to 4.6 and newer.
2-
3-
:ign-config-version: 3.1.0
4-
ifeval::[{product-version} > 4.6]
5-
:ign-config-version: 3.2.0
6-
endif::[]
1+
// Module included in the following assemblies:
2+
//
3+
// * support/troubleshooting/troubleshooting-network-issues.adoc
74

5+
:_content-type: CONCEPT
86
[id="nw-how-nw-iface-selected_{context}"]
97
= How the network interface is selected
108

@@ -16,11 +14,6 @@ When the kubelet service starts, it reads the value of the environment variable
1614

1715
If hardware or networking is reconfigured after installation, or if there is a networking layout where the node IP should not come from the default route interface, it is possible for the `nodeip-configuration.service` service to select a different NIC after a reboot. In some cases, you might be able to detect that a different NIC is selected by reviewing the `INTERNAL-IP` column in the output from the `oc get nodes -o wide` command.
1816

19-
If network communication is disrupted or misconfigured because a different NIC is selected, you might receive the following error: `EtcdCertSignerControllerDegraded`. You can create a hint file that includes the `NODEIP_HINT` variable to override the default IP selection logic. For more information, see Optional: Overriding the default node IP selection logic.
17+
If network communication is disrupted or misconfigured because a different NIC is selected, you might receive the following error: `EtcdCertSignerControllerDegraded`. You can create a hint file that includes the `NODEIP_HINT` variable to override the default IP selection logic. For more information, see Optional: Overriding the default node IP selection logic.
2018

2119
// Link to info for creating a machine config.
22-
23-
// Clear temporary attributes
24-
ifdef::ign-config-version[]
25-
:!ign-config-version:
26-
endif::[]

0 commit comments

Comments
 (0)