Skip to content

Commit 9ca3860

Browse files
authored
Merge pull request #96002 from mburke5678/node-description-not-match
OCPBUGS#55692: Node description does not match OpenShift configuration
2 parents ba60614 + 6302e43 commit 9ca3860

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

modules/nw-operator-cr.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ spec:
123123
- FRR
124124
----
125125

126-
|`spec.kubeProxyConfig`
127-
|`object`
128-
|
129-
The fields for this object specify the kube-proxy configuration.
130-
If you are using the OVN-Kubernetes cluster network plugin, the kube-proxy configuration has no effect.
131126
|====
132127

133128
[IMPORTANT]

nodes/index.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ Using the OpenShift CLI (`oc`) or the web console, you can perform the following
3838

3939
The following components of a node are responsible for maintaining the running of pods and providing the Kubernetes runtime environment.
4040

41-
Container runtime:: The container runtime is responsible for running containers. Kubernetes offers several runtimes such as containerd, cri-o, rktlet, and Docker.
41+
Container runtime:: The container runtime is responsible for running containers. {product-title} deploys the CRI-O container runtime on each of the {op-system-first} nodes in your cluster. The Windows Machine Config Operator (WMCO) deploys the containerd runtime on its Windows nodes.
4242

4343
Kubelet:: Kubelet runs on nodes and reads the container manifests. It ensures that the defined containers have started and are running. The kubelet process maintains the state of work and the node server. Kubelet manages network rules and port forwarding. The kubelet manages containers that are created by Kubernetes only.
4444

45-
Kube-proxy:: Kube-proxy runs on every node in the cluster and maintains the network traffic between the Kubernetes resources. A Kube-proxy ensures that the networking environment is isolated and accessible.
46-
4745
DNS:: Cluster DNS is a DNS server which serves DNS records for Kubernetes services. Containers started by Kubernetes automatically include this DNS server in their DNS searches.
4846

4947
ifndef::openshift-rosa-hcp[]
@@ -281,4 +279,4 @@ Indicates that the pod is allowed (but not required) to be scheduled on nodes or
281279

282280
[id="commonterms-node-taint"]
283281
Taint::
284-
A core object that comprises a key, value, and effect. Taints and tolerations work together to ensure that pods are not scheduled on irrelevant nodes.
282+
A core object that comprises a key, value, and effect. Taints and tolerations work together to ensure that pods are not scheduled on irrelevant nodes.

0 commit comments

Comments
 (0)