Skip to content

Commit 0468726

Browse files
authored
Merge pull request #91350 from openshift-cherrypick-robot/cherry-pick-91315-to-enterprise-4.17
[enterprise-4.17] OCPBUGS-54352 Default value seems to be set to false for the parameter enableInjector and enableOperatorWebhook
2 parents ac26606 + e840bde commit 0468726

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

modules/nw-sriov-configuring-operator.adoc

+12-15
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@
1515
apiVersion: sriovnetwork.openshift.io/v1
1616
kind: SriovOperatorConfig
1717
metadata:
18-
name: default
18+
name: default <1>
1919
namespace: openshift-sriov-network-operator
2020
spec:
2121
disableDrain: false
22-
enableInjector: true
23-
enableOperatorWebhook: true
22+
enableInjector: true <2>
23+
enableOperatorWebhook: true <3>
2424
logLevel: 2
2525
featureGates:
2626
metricsExporter: false
2727
----
2828
+
29-
[NOTE]
30-
====
31-
The only valid name for the `SriovOperatorConfig` resource is `default` and it must be in the namespace where the Operator is deployed.
32-
====
29+
<1> The only valid name for the `SriovOperatorConfig` resource is `default` and it must be in the namespace where the Operator is deployed.
30+
<2> The `enableInjector` field, if not specified in the CR or explicitly set to `true`, defaults to `false` or `<none>`, preventing any `network-resources-injector` pod from running in the namespace. The recommended setting is `true`.
31+
<3> The `enableOperatorWebhook` field, if not specified in the CR or explicitly set to true, defaults to `false` or `<none>`, preventing any `operator-webhook` pod from running in the namespace. The recommended setting is `true`.
3332

3433
.. Create the resource by running the following command:
3534
+
@@ -75,12 +74,11 @@ For single-node clusters, set this field to `true` after installing the Operator
7574
|`spec.enableInjector`
7675
|`boolean`
7776
|Specifies whether to enable or disable the Network Resources Injector daemon set.
78-
By default, this field is set to `true`.
7977

8078
|`spec.enableOperatorWebhook`
8179
|`boolean`
8280
|Specifies whether to enable or disable the Operator Admission Controller webhook daemon set.
83-
By default, this field is set to `true`.
81+
8482

8583
|`spec.logLevel`
8684
|`integer`
@@ -107,7 +105,7 @@ application. It provides the following capabilities:
107105
* Mutation of resource requests and limits in a pod specification to add an SR-IOV resource name according to an SR-IOV network attachment definition annotation.
108106
* Mutation of a pod specification with a Downward API volume to expose pod annotations, labels, and huge pages requests and limits. Containers that run in the pod can access the exposed information as files under the `/etc/podnetinfo` path.
109107

110-
By default, the Network Resources Injector is enabled by the SR-IOV Network Operator and runs as a daemon set on all control plane nodes. The following is an example of Network Resources Injector pods running in a cluster with three control plane nodes:
108+
The Network Resources Injector is enabled by the SR-IOV Network Operator when the `enableInjector` is set to `true` in the `SriovOperatorConfig` CR. The `network-resources-injector` pod runs as a daemon set on all control plane nodes. The following is an example of Network Resources Injector pods running in a cluster with three control plane nodes:
111109

112110
[source,terminal]
113111
----
@@ -126,7 +124,7 @@ network-resources-injector-lktz5 1/1 Running 0 10m
126124
[id="disable-enable-network-resource-injector_{context}"]
127125
== Disabling or enabling the Network Resources Injector
128126

129-
To disable or enable the Network Resources Injector, which is enabled by default, complete the following procedure.
127+
To disable or enable the Network Resources Injector, complete the following procedure.
130128

131129
.Prerequisites
132130

@@ -164,13 +162,12 @@ spec:
164162
[id="about-sr-iov-operator-admission-control-webhook_{context}"]
165163
== About the SR-IOV Network Operator admission controller webhook
166164

167-
The SR-IOV Network Operator Admission Controller webhook is a Kubernetes Dynamic
168-
Admission Controller application. It provides the following capabilities:
165+
The SR-IOV Network Operator Admission Controller webhook is a Kubernetes Dynamic Admission Controller application. It provides the following capabilities:
169166

170167
* Validation of the `SriovNetworkNodePolicy` CR when it is created or updated.
171168
* Mutation of the `SriovNetworkNodePolicy` CR by setting the default value for the `priority` and `deviceType` fields when the CR is created or updated.
172169

173-
By default the SR-IOV Network Operator Admission Controller webhook is enabled by the Operator and runs as a daemon set on all control plane nodes.
170+
The SR-IOV Network Operator Admission Controller webhook is enabled by the Operator when the `enableOperatorWebhook` is set to `true` in the `SriovOperatorConfig` CR. The `operator-webhook` pod runs as a daemon set on all control plane nodes.
174171

175172
[NOTE]
176173
====
@@ -196,7 +193,7 @@ operator-webhook-rpfrl 1/1 Running 0 16m
196193
[id="disable-enable-sr-iov-operator-admission-control-webhook_{context}"]
197194
== Disabling or enabling the SR-IOV Network Operator admission controller webhook
198195

199-
To disable or enable the admission controller webhook, which is enabled by default, complete the following procedure.
196+
To disable or enable the admission controller webhook, complete the following procedure.
200197

201198
.Prerequisites
202199

0 commit comments

Comments
 (0)