Skip to content

Commit 76dcb2e

Browse files
authored
Merge pull request #46182 from slovern/BZ2091930
BZ2091930 - SRO install - remove instructions to create namespace and OperatorGroup
2 parents 8cf4c5d + 4319df3 commit 76dcb2e

File tree

2 files changed

+7
-52
lines changed

2 files changed

+7
-52
lines changed

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

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,7 @@ As a cluster administrator, you can install the Special Resource Operator (SRO)
1717
1818
.Procedure
1919

20-
. Create a namespace for the Special Resource Operator:
21-
22-
.. Create the following `Namespace` custom resource (CR) that defines the `openshift-special-resource-operator` namespace, and then save the YAML in the `sro-namespace.yaml` file:
23-
+
24-
[source,yaml]
25-
----
26-
apiVersion: v1
27-
kind: Namespace
28-
metadata:
29-
name: openshift-special-resource-operator
30-
----
31-
32-
.. Create the namespace by running the following command:
33-
+
34-
[source,terminal]
35-
----
36-
$ oc create -f sro-namespace.yaml
37-
----
38-
39-
. Install the SRO in the namespace you created in the previous step:
40-
41-
.. Create the following `OperatorGroup` CR and save the YAML in the `sro-operatorgroup.yaml` file:
42-
+
43-
[source,yaml]
44-
----
45-
apiVersion: operators.coreos.com/v1
46-
kind: OperatorGroup
47-
metadata:
48-
generateName: openshift-special-resource-operator-
49-
name: openshift-special-resource-operator
50-
namespace: openshift-special-resource-operator
51-
spec:
52-
targetNamespaces:
53-
- openshift-special-resource-operator
54-
----
55-
56-
.. Create the operator group by running the following command:
57-
+
58-
[source,terminal]
59-
----
60-
$ oc create -f sro-operatorgroup.yaml
61-
----
20+
. Install the SRO in the `openshift-operators` namespace:
6221

6322
.. Create the following `Subscription` CR and save the YAML in the `sro-sub.yaml` file:
6423
+
@@ -69,7 +28,7 @@ apiVersion: operators.coreos.com/v1alpha1
6928
kind: Subscription
7029
metadata:
7130
name: openshift-special-resource-operator
72-
namespace: openshift-special-resource-operator
31+
namespace: openshift-operators
7332
spec:
7433
channel: "stable"
7534
installPlanApproval: Automatic
@@ -85,11 +44,11 @@ spec:
8544
$ oc create -f sro-sub.yaml
8645
----
8746

88-
.. Switch to the `openshift-special-resource-operator` project:
47+
.. Switch to the `openshift-operators` project:
8948
+
9049
[source,terminal]
9150
----
92-
$ oc project openshift-special-resource-operator
51+
$ oc project openshift-operators
9352
----
9453

9554
.Verification

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ As a cluster administrator, you can install the Special Resource Operator (SRO)
1515
.Procedure
1616

1717
. Log in to the {product-title} web console.
18-
. Create the required namespace for the Special Resource Operator:
19-
.. Navigate to *Administration* -> *Namespaces* and click *Create Namespace*.
20-
.. Enter `openshift-special-resource-operator` in the *Name* field and click *Create*.
21-
2218
. Install the Special Resource Operator:
2319
.. In the {product-title} web console, click *Operators* -> *OperatorHub*.
2420

@@ -31,7 +27,7 @@ As a cluster administrator, you can install the Special Resource Operator (SRO)
3127
To verify that the Special Resource Operator installed successfully:
3228

3329
. Navigate to the *Operators* -> *Installed Operators* page.
34-
. Ensure that *Special Resource Operator* is listed in the *openshift-special-resource-operator* project with a *Status* of *InstallSucceeded*.
30+
. Ensure that *Special Resource Operator* is listed in the *openshift-operators* project with a *Status* of *InstallSucceeded*.
3531
+
3632
[NOTE]
3733
====
@@ -41,10 +37,10 @@ During installation, an Operator might display a *Failed* status. If the install
4137
. If the Operator does not appear as installed, to troubleshoot further:
4238
+
4339
.. Navigate to the *Operators* -> *Installed Operators* page and inspect the *Operator Subscriptions* and *Install Plans* tabs for any failure or errors under *Status*.
44-
.. Navigate to the *Workloads* -> *Pods* page and check the logs for pods in the `openshift-special-resource-operator` project.
40+
.. Navigate to the *Workloads* -> *Pods* page and check the logs for pods in the `openshift-operators` project.
4541

4642
+
4743
[NOTE]
4844
====
4945
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.
50-
====
46+
====

0 commit comments

Comments
 (0)