Skip to content

Commit 7a096b1

Browse files
author
Bob Furu
authored
Merge pull request #37124 from kmccarron-rh/sro-updates
2 parents 525d6ba + 78ef843 commit 7a096b1

6 files changed

+17
-17
lines changed

modules/psap-special-resource-operator-installing-using-cli.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metadata:
3535
$ oc create -f sro-namespace.yaml
3636
----
3737

38-
. Install SRO in the namespace you created in the previous step:
38+
. Install the SRO in the namespace you created in the previous step:
3939

4040
.. Create the following `OperatorGroup` CR and save the YAML in the `sro-operatorgroup.yaml` file:
4141
+
@@ -74,7 +74,7 @@ $ oc get packagemanifest special-resource-operator -n openshift-marketplace -o j
7474

7575
.. Create the following `Subscription` CR and save the YAML in the `sro-sub.yaml` file:
7676
+
77-
.Example subscription CR
77+
.Example Subscription CR
7878
[source,yaml]
7979
----
8080
apiVersion: operators.coreos.com/v1alpha1

modules/psap-special-resource-operator-installing-using-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ During installation, an Operator might display a *Failed* status. If the install
4545
+
4646
[NOTE]
4747
====
48-
The Node Feature Discovery (NFD) Operator is a dependency of the Special Resource Operator (SRO). If the NFD Operator is not installed before installing SRO, the Operator Lifecycle Manager will automatically install the NFD Operator. However, the required Node Feature Discovery operand will not be deployed automatically. The Node Feature Discovery Operator documentation provides details about how to deploy NFD by using the NFD Operator.
48+
The Node Feature Discovery (NFD) Operator is a dependency of the Special Resource Operator (SRO). If the NFD Operator is not installed before installing the SRO, the Operator Lifecycle Manager will automatically install the NFD Operator. However, the required Node Feature Discovery operand will not be deployed automatically. The Node Feature Discovery Operator documentation provides details about how to deploy NFD by using the NFD Operator.
4949
====

modules/psap-special-resource-operator-using-configmaps.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
[id="deploy-simple-kmod-using-configmap-chart"]
66
= Building and running the simple-kmod SpecialResource by using a config map
77

8-
In this example, the simple-kmod kernel module is used to show how SRO can manage a driver container which is defined in Helm chart templates stored in a config map.
8+
In this example, the simple-kmod kernel module is used to show how the SRO can manage a driver container which is defined in Helm chart templates stored in a config map.
99

1010
.Prerequisites
1111

1212
* You have a running {product-title} cluster.
1313
* You set the Image Registry Operator state to `Managed` for your cluster.
1414
* You installed the OpenShift CLI (`oc`).
1515
* You are logged into the OpenShift CLI as a user with `cluster-admin` privileges.
16-
* You installed Node Feature Discovery (NFD) Operator.
16+
* You installed the Node Feature Discovery (NFD) Operator.
1717
* You installed the Special Resource Operator.
1818
* You installed the Helm CLI (`helm`).
1919

@@ -31,7 +31,7 @@ $ mkdir -p chart/simple-kmod-0.0.1/templates
3131
$ cd chart/simple-kmod-0.0.1/templates
3232
----
3333

34-
.. Save this YAML template for the image stream and build config in the `templates` directory as `0000-buildconfig.yaml`.
34+
.. Save this YAML template for the image stream and build config in the `templates` directory as `0000-buildconfig.yaml`:
3535
+
3636
[source,yaml]
3737
----
@@ -82,7 +82,7 @@ spec:
8282
kind: ImageStreamTag
8383
name: {{.Values.specialresource.metadata.name}}-{{.Values.groupName.driverContainer}}:v{{.Values.kernelFullVersion}} <1>
8484
----
85-
<1> The templates such as `{{.Values.specialresource.metadata.name}}` are filled in by SRO, based on fields in the `SpecialResource` CR and variables known to the Operator such as `{{.Values.KernelFullVersion}}`
85+
<1> The templates such as `{{.Values.specialresource.metadata.name}}` are filled in by the SRO, based on fields in the `SpecialResource` CR and variables known to the Operator such as `{{.Values.KernelFullVersion}}`.
8686

8787
.. Save the following YAML template for the RBAC resources and daemon set in the `templates` directory as `1000-driver-container.yaml`:
8888
+
@@ -198,7 +198,7 @@ $ helm package simple-kmod-0.0.1/
198198
Successfully packaged chart and saved it to: /data/<username>/git/<github_username>/special-resource-operator/yaml-for-docs/chart/simple-kmod-0.0.1/simple-kmod-0.0.1.tgz
199199
----
200200

201-
. Create a configuration map to store the chart files:
201+
. Create a config map to store the chart files:
202202
.. Create a directory for the config map files:
203203
+
204204
[source,terminal]
@@ -261,7 +261,7 @@ spec:
261261
uri: "https://github.com/openshift-psap/kvc-simple-kmod.git"
262262
----
263263
<1> Optional: Uncomment the `#debug: true` line to have the YAML files in the chart printed in full in the Operator logs and to verify that the logs are created and templated properly.
264-
<2> The `spec.chart.repository.url` field tells SRO to look for the chart in a config map.
264+
<2> The `spec.chart.repository.url` field tells the SRO to look for the chart in a config map.
265265

266266
. From a command line, create the `SpecialResource` file:
267267
+

modules/psap-special-resource-operator-using-manifests.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="deploy-simple-kmod-using-local-chart_{context}"]
66
= Building and running the simple-kmod SpecialResource by using the templates from the SRO image
77

8-
The SRO image contains a local repository of Helm charts including the templates for deploying the simple-kmod kernel module. In this example, the simple-kmod kernel module is used to show how SRO can manage a driver container that is defined in the internal SRO repository.
8+
The SRO image contains a local repository of Helm charts including the templates for deploying the simple-kmod kernel module. In this example, the simple-kmod kernel module is used to show how the SRO can manage a driver container that is defined in the internal SRO repository.
99

1010
.Prerequisites
1111

@@ -81,7 +81,7 @@ simple-kmod-driver-container-12813789169ac0ee-qtkff 1/1 Running 0
8181
$ oc logs pod/simple-kmod-driver-build-12813789169ac0ee-1-build -n simple-kmod
8282
----
8383

84-
. To verify that the simple-kmod kernel modules are loaded, execute the `lsmod` command in one of the driver container pods that was returned from the `oc get pods` command above.
84+
. To verify that the simple-kmod kernel modules are loaded, execute the `lsmod` command in one of the driver container pods that was returned from the `oc get pods` command above:
8585
+
8686
[source,terminal]
8787
----

modules/psap-special-resource-operator-using.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// * hardware_enablement/psap-special-resource-operator.adoc
44

55
[id="using-the-special-resource-operator_{context}"]
6-
= Using Special Resource Operator
6+
= Using the Special Resource Operator
77

8-
Special Resource Operator (SRO) is used to manage the build and deployment of a driver container. The objects required to build and deploy the container can be defined in a Helm chart.
8+
The Special Resource Operator (SRO) is used to manage the build and deployment of a driver container. The objects required to build and deploy the container can be defined in a Helm chart.
99

10-
The examples in this section use the simple-kmod kernel module to demonstrate how to use SRO to build and run a driver container.
10+
The examples in this section use the simple-kmod kernel module to demonstrate how to use the SRO to build and run a driver container.
1111
In the first example, the SRO image contains a local repository of Helm charts including the templates for deploying the simple-kmod kernel module. In this case, a `SpecialResource` manifest is used to deploy the driver container. In the second example, the simple-kmod `SpecialResource` object points to a `ConfigMap` object that is created to store the Helm charts.

modules/psap-special-resource-operator.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// * hardware_enablement/psap-special-resource-operator.adoc
44

55
[id="about-special-resource-operator_{context}"]
6-
= About Special Resource Operator
6+
= About the Special Resource Operator
77

8-
Special Resource Operator (SRO) helps you manage the deployment of kernel modules and drivers on an existing {product-title} cluster. SRO can be used for a case as simple as building and loading a single kernel module, or as complex as deploying the driver, device plug-in, and monitoring stack for a hardware accelerator.
8+
The Special Resource Operator (SRO) helps you manage the deployment of kernel modules and drivers on an existing {product-title} cluster. The SRO can be used for a case as simple as building and loading a single kernel module, or as complex as deploying the driver, device plug-in, and monitoring stack for a hardware accelerator.
99

10-
For loading kernel modules, SRO is designed around the use of driver containers. Driver containers are increasingly being used in cloud-native environments, especially when run on pure container operating systems, to deliver hardware drivers to the host. Driver containers extend the kernel stack beyond the out-of-the-box software and hardware features of a specific kernel. Driver containers work on various container-capable Linux distributions. With driver containers, the host operating system stays clean and there is no clash between different library versions or binaries on the host.
10+
For loading kernel modules, the SRO is designed around the use of driver containers. Driver containers are increasingly being used in cloud-native environments, especially when run on pure container operating systems, to deliver hardware drivers to the host. Driver containers extend the kernel stack beyond the out-of-the-box software and hardware features of a specific kernel. Driver containers work on various container-capable Linux distributions. With driver containers, the host operating system stays clean and there is no clash between different library versions or binaries on the host.

0 commit comments

Comments
 (0)