Skip to content

Commit 115707a

Browse files
committed
TELCODOCS-1893 SriovOperatorConfig will no longer be created by the Operator in 4.16 and onwards
1 parent be8eb2c commit 115707a

File tree

2 files changed

+31
-17
lines changed

2 files changed

+31
-17
lines changed

modules/nw-sriov-configuring-operator.adoc

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,35 @@
66
[id="nw-sriov-configuring-operator_{context}"]
77
= Configuring the SR-IOV Network Operator
88

9-
[IMPORTANT]
9+
* Create a `SriovOperatorConfig` custom resource (CR) to deploy all the SR-IOV Operator components:
10+
11+
.. Create a file named `sriovOperatorConfig.yaml` using the following YAML:
12+
+
13+
[source,yaml]
14+
----
15+
apiVersion: sriovnetwork.openshift.io/v1
16+
kind: SriovOperatorConfig
17+
metadata:
18+
name: default
19+
namespace: openshift-sriov-network-operator
20+
spec:
21+
disableDrain: false
22+
enableInjector: true
23+
enableOperatorWebhook: true
24+
logLevel: 2
25+
----
26+
+
27+
[NOTE]
1028
====
11-
Modifying the SR-IOV Network Operator configuration is not normally necessary.
12-
The default configuration is recommended for most use cases.
13-
Complete the steps to modify the relevant configuration only if the default behavior of the Operator is not compatible with your use case.
29+
The only valid name for the `SriovOperatorConfig` resource is `default` and it must be in the namespace where the Operator is deployed.
1430
====
1531

16-
The SR-IOV Network Operator adds the `SriovOperatorConfig.sriovnetwork.openshift.io` CustomResourceDefinition resource.
17-
The Operator automatically creates a SriovOperatorConfig custom resource (CR) named `default` in the `openshift-sriov-network-operator` namespace.
18-
19-
[NOTE]
20-
=====
21-
The `default` CR contains the SR-IOV Network Operator configuration for your cluster.
22-
To change the Operator configuration, you must modify this CR.
23-
=====
32+
.. Create the resource by running the following command:
33+
+
34+
[source,terminal]
35+
----
36+
$ oc apply -f sriovOperatorConfig.yaml
37+
----
2438

2539
[id="nw-sriov-operator-cr_{context}"]
2640
== SR-IOV Network Operator config custom resource
@@ -284,13 +298,11 @@ After performing the following procedure to disable draining workloads, you must
284298

285299
.Procedure
286300

287-
- To set the `disableDrain` field to `true`, enter the following command:
301+
- To set the `disableDrain` field to `true` and the `configDaemonNodeSelector` field to `node-role.kubernetes.io/master: ""` , enter the following command:
288302
+
289303
[source,terminal]
290304
----
291-
$ oc patch sriovoperatorconfig default --type=merge \
292-
-n openshift-sriov-network-operator \
293-
--patch '{ "spec": { "disableDrain": true } }'
305+
$ oc patch sriovoperatorconfig default --type=merge -n openshift-sriov-network-operator --patch '{ "spec": { "disableDrain": true, "configDaemonNodeSelector": { "node-role.kubernetes.io/master": "" } } }'
294306
----
295307
+
296308
[TIP]
@@ -306,5 +318,7 @@ metadata:
306318
namespace: openshift-sriov-network-operator
307319
spec:
308320
disableDrain: true
321+
configDaemonNodeSelector:
322+
node-role.kubernetes.io/master: ""
309323
----
310324
====

networking/hardware_networks/installing-sriov-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ include::modules/nw-sriov-installing-operator.adoc[leveloffset=+1]
1313
[id="installing-sriov-operator-next-steps"]
1414
== Next steps
1515

16-
* Optional: xref:../../networking/hardware_networks/configuring-sriov-operator.adoc#configuring-sriov-operator[Configuring the SR-IOV Network Operator]
16+
* xref:../../networking/hardware_networks/configuring-sriov-operator.adoc#configuring-sriov-operator[Configuring the SR-IOV Network Operator]

0 commit comments

Comments
 (0)