Skip to content

Commit 11be993

Browse files
authored
Merge pull request #91349 from openshift-cherrypick-robot/cherry-pick-91315-to-enterprise-4.16
[enterprise-4.16] OCPBUGS-54352 Default value seems to be set to false for the parameter enableInjector and enableOperatorWebhook
2 parents 0e15f0b + 3d9f089 commit 11be993

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

modules/nw-sriov-configuring-operator.adoc

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@
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
----
2626
+
27-
[NOTE]
28-
====
29-
The only valid name for the `SriovOperatorConfig` resource is `default` and it must be in the namespace where the Operator is deployed.
30-
====
27+
<1> The only valid name for the `SriovOperatorConfig` resource is `default` and it must be in the namespace where the Operator is deployed.
28+
<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`.
29+
<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`.
3130

3231
.. Create the resource by running the following command:
3332
+
@@ -73,12 +72,11 @@ For single-node clusters, set this field to `true` after installing the Operator
7372
|`spec.enableInjector`
7473
|`boolean`
7574
|Specifies whether to enable or disable the Network Resources Injector daemon set.
76-
By default, this field is set to `true`.
7775

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

8381
|`spec.logLevel`
8482
|`integer`
@@ -97,7 +95,7 @@ application. It provides the following capabilities:
9795
* 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.
9896
* 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.
9997

100-
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:
98+
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:
10199

102100
[source,terminal]
103101
----
@@ -116,7 +114,7 @@ network-resources-injector-lktz5 1/1 Running 0 10m
116114
[id="disable-enable-network-resource-injector_{context}"]
117115
== Disabling or enabling the Network Resources Injector
118116

119-
To disable or enable the Network Resources Injector, which is enabled by default, complete the following procedure.
117+
To disable or enable the Network Resources Injector, complete the following procedure.
120118

121119
.Prerequisites
122120

@@ -154,13 +152,12 @@ spec:
154152
[id="about-sr-iov-operator-admission-control-webhook_{context}"]
155153
== About the SR-IOV Network Operator admission controller webhook
156154

157-
The SR-IOV Network Operator Admission Controller webhook is a Kubernetes Dynamic
158-
Admission Controller application. It provides the following capabilities:
155+
The SR-IOV Network Operator Admission Controller webhook is a Kubernetes Dynamic Admission Controller application. It provides the following capabilities:
159156

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

163-
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.
160+
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.
164161

165162
[NOTE]
166163
====
@@ -186,7 +183,7 @@ operator-webhook-rpfrl 1/1 Running 0 16m
186183
[id="disable-enable-sr-iov-operator-admission-control-webhook_{context}"]
187184
== Disabling or enabling the SR-IOV Network Operator admission controller webhook
188185

189-
To disable or enable the admission controller webhook, which is enabled by default, complete the following procedure.
186+
To disable or enable the admission controller webhook, complete the following procedure.
190187

191188
.Prerequisites
192189

0 commit comments

Comments
 (0)