Skip to content

Commit f4eeadf

Browse files
neal-timpeneal-timpe
authored
Merge pull request #30605 from JStickler/OSSMDOC-177
OSSMDOC-177 Missing removal steps.
2 parents 23cd2d4 + 5ea1af5 commit f4eeadf

File tree

5 files changed

+197
-79
lines changed

5 files changed

+197
-79
lines changed

‎modules/ossm-remove-cleanup-1x.adoc‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * service_mesh/v1x/installing-ossm.adoc
4+
5+
6+
[id="ossm-remove-cleanup-1x_{context}"]
7+
= Clean up Operator resources
8+
9+
Follow this procedure to manually remove resources left behind after removing the {ProductName} Operator using the OpenShift console.
10+
11+
.Prerequisites
12+
13+
* An account with cluster administration access.
14+
* Access to the {product-title} Command-line Interface (CLI) also known as `oc`.
15+
16+
.Procedure
17+
18+
. Log in to the {product-title} CLI as a cluster administrator.
19+
20+
. Run the following commands to clean up resources after uninstalling the Operators. If you intend to keep using Jaeger as a stand alone service without service mesh, do not delete the Jaeger resources.
21+
+
22+
[NOTE]
23+
====
24+
The Operators are installed in the `openshift-operators` namespace by default. If you installed the Operators in another namespace, replace `openshift-operators` with the name of the project where the {ProductName} Operator was installed.
25+
====
26+
+
27+
[source,terminal]
28+
----
29+
$ oc delete validatingwebhookconfiguration/openshift-operators.servicemesh-resources.maistra.io
30+
----
31+
+
32+
[source,terminal]
33+
----
34+
$ oc delete mutatingwebhookconfigurations/openshift-operators.servicemesh-resources.maistra.io
35+
----
36+
+
37+
[source,terminal]
38+
----
39+
$ oc delete -n openshift-operators daemonset/istio-node
40+
----
41+
+
42+
[source,terminal]
43+
----
44+
$ oc delete clusterrole/istio-admin clusterrole/istio-cni clusterrolebinding/istio-cni
45+
----
46+
// needs a slash? What is the format here?
47+
+
48+
[source,terminal]
49+
----
50+
$ oc delete clusterrole istio-view istio-edit
51+
----
52+
+
53+
[source,terminal]
54+
----
55+
$ oc delete clusterrole jaegers.jaegertracing.io-v1-admin jaegers.jaegertracing.io-v1-crdview jaegers.jaegertracing.io-v1-edit jaegers.jaegertracing.io-v1-view
56+
----
57+
+
58+
[source,terminal]
59+
----
60+
$ oc get crds -o name | grep '.*\.istio\.io' | xargs -r -n 1 oc delete
61+
----
62+
+
63+
[source,terminal]
64+
----
65+
$ oc get crds -o name | grep '.*\.maistra\.io' | xargs -r -n 1 oc delete
66+
----
67+
+
68+
[source,terminal]
69+
----
70+
$ oc get crds -o name | grep '.*\.kiali\.io' | xargs -r -n 1 oc delete
71+
----
72+
+
73+
[source,terminal]
74+
----
75+
$ oc delete crds jaegers.jaegertracing.io
76+
----
77+
+
78+
[source,terminal]
79+
----
80+
$ oc delete svc admission-controller -n <operator-project>
81+
----
82+
+
83+
[source,terminal]
84+
----
85+
$ oc delete project <istio-system-project>
86+
----

‎modules/ossm-remove-cleanup.adoc‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * service_mesh/v2x/installing-ossm.adoc
4+
5+
6+
[id="ossm-remove-cleanup_{context}"]
7+
= Clean up Operator resources
8+
9+
Follow this procedure to manually remove resources left behind after removing the {ProductName} Operator using the OpenShift console.
10+
11+
.Prerequisites
12+
13+
* An account with cluster administration access.
14+
* Access to the {product-title} Command-line Interface (CLI) also known as `oc`.
15+
16+
.Procedure
17+
18+
. Log in to the {product-title} CLI as a cluster administrator.
19+
20+
. Run the following commands to clean up resources after uninstalling the Operators. If you intend to keep using Jaeger as a stand alone service without service mesh, do not delete the Jaeger resources.
21+
+
22+
[NOTE]
23+
====
24+
The Operators are installed in the `openshift-operators` namespace by default. If you installed the Operators in another namespace, replace `openshift-operators` with the name of the project where the {ProductName} Operator was installed.
25+
====
26+
+
27+
[source,terminal]
28+
----
29+
$ oc delete validatingwebhookconfiguration/openshift-operators.servicemesh-resources.maistra.io
30+
----
31+
+
32+
[source,terminal]
33+
----
34+
$ oc delete mutatingwebhookconfigurations/openshift-operators.servicemesh-resources.maistra.io
35+
----
36+
+
37+
[source,terminal]
38+
----
39+
$ oc delete svc maistra-admission-controller -n openshift-operators
40+
----
41+
+
42+
[source,terminal]
43+
----
44+
$ oc delete -n openshift-operators daemonset/istio-node
45+
----
46+
+
47+
[source,terminal]
48+
----
49+
$ oc delete clusterrole/istio-admin clusterrole/istio-cni clusterrolebinding/istio-cni
50+
----
51+
+
52+
[source,terminal]
53+
----
54+
$ oc delete clusterrole istio-view istio-edit
55+
----
56+
+
57+
[source,terminal]
58+
----
59+
$ oc delete clusterrole jaegers.jaegertracing.io-v1-admin jaegers.jaegertracing.io-v1-crdview jaegers.jaegertracing.io-v1-edit jaegers.jaegertracing.io-v1-view
60+
----
61+
+
62+
[source,terminal]
63+
----
64+
$ oc get crds -o name | grep '.*\.istio\.io' | xargs -r -n 1 oc delete
65+
----
66+
+
67+
[source,terminal]
68+
----
69+
$ oc get crds -o name | grep '.*\.maistra\.io' | xargs -r -n 1 oc delete
70+
----
71+
+
72+
[source,terminal]
73+
----
74+
$ oc get crds -o name | grep '.*\.kiali\.io' | xargs -r -n 1 oc delete
75+
----
76+
+
77+
[source,terminal]
78+
----
79+
$ oc delete crds jaegers.jaegertracing.io
80+
----
81+
+
82+
[source,terminal]
83+
----
84+
$ oc delete secret -n openshift-operators maistra-operator-serving-cert
85+
----
86+
+
87+
[source,terminal]
88+
----
89+
$ oc delete cm -n openshift-operators maistra-operator-cabundle
90+
----

modules/ossm-operatorhub-remove.adoc renamed to modules/ossm-remove-operators.adoc

Lines changed: 15 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
// * service_mesh/v1x/installing-ossm.adoc
44
// * service_mesh/v2x/installing-ossm.adoc
55

6-
[id="ossm-operatorhub-remove_{context}"]
6+
[id="ossm-operatorhub-remove-operators_{context}"]
77
= Removing the installed Operators
88

9-
You must remove the Operators to successfully remove {ProductName}. Once you
10-
remove the {ProductName} Operator, you must remove the Jaeger Operator, Kiali
11-
Operator, and the Elasticsearch Operator.
9+
You must remove the Operators to successfully remove {ProductName}. Once you remove the {ProductName} Operator, you must remove the Kiali Operator, the Jaeger Operator, and the Elasticsearch Operator.
1210

1311
[id="ossm-remove-operator-servicemesh_{context}"]
1412
== Removing the {ProductName} Operator
@@ -24,35 +22,31 @@ Follow this procedure to remove the {ProductName} Operator.
2422

2523
. Log in to the {product-title} web console.
2624

27-
. From the *Operators* → *Installed Operators* page, scroll or type a keyword into
28-
the *Filter by name* to find the {ProductName} Operator. Then, click on it.
25+
. From the *Operators* → *Installed Operators* page, scroll or type a keyword into the *Filter by name* to find the {ProductName} Operator. Then, click on it.
2926

30-
. On the right-hand side of the *Operator Details* page, select *Uninstall
31-
Operator* from the *Actions* drop-down menu.
27+
. On the right-hand side of the *Operator Details* page, select *Uninstall Operator* from the *Actions* drop-down menu.
3228

3329
. When prompted by the *Remove Operator Subscription* window, optionally select the
3430
*Also completely remove the Operator from the selected namespace*
3531
check box if you want all components related to the installation to be removed.
36-
This removes the CSV, which in turn removes the pods, Deployments, CRDs, and CRs
37-
associated with the Operator.
32+
This removes the CSV, which in turn removes the pods, Deployments, CRDs, and CRs associated with the Operator.
3833

34+
[id="ossm-remove-operator-kiali_{context}"]
35+
== Removing the Kiali Operator
3936

40-
[id="ossm-remove-operator-jaeger_{context}"]
41-
== Removing the Jaeger Operator
42-
43-
Follow this procedure to remove the Jaeger Operator.
37+
Follow this procedure to remove the Kiali Operator.
4438

4539
.Prerequisites
4640

4741
* Access to the {product-title} web console.
48-
* The Jaeger Operator must be installed.
42+
* The Kiali Operator must be installed.
4943

5044
.Procedure
5145

5246
. Log in to the {product-title} web console.
5347

5448
. From the *Operators* → *Installed Operators* page, scroll or type a keyword into
55-
the *Filter by name* to find the Jaeger Operator. Then, click on it.
49+
the *Filter by name* to find the Kiali Operator. Then, click on it.
5650

5751
. On the right-hand side of the *Operator Details* page, select *Uninstall
5852
Operator* from the *Actions* drop-down menu.
@@ -63,22 +57,22 @@ check box if you want all components related to the installation to be removed.
6357
This removes the CSV, which in turn removes the pods, Deployments, CRDs, and CRs
6458
associated with the Operator.
6559

66-
[id="ossm-remove-operator-kiali_{context}"]
67-
== Removing the Kiali Operator
60+
[id="ossm-remove-operator-jaeger_{context}"]
61+
== Removing the Jaeger Operator
6862

69-
Follow this procedure to remove the Kiali Operator.
63+
Follow this procedure to remove the Jaeger Operator.
7064

7165
.Prerequisites
7266

7367
* Access to the {product-title} web console.
74-
* The Kiali Operator must be installed.
68+
* The Jaeger Operator must be installed.
7569

7670
.Procedure
7771

7872
. Log in to the {product-title} web console.
7973

8074
. From the *Operators* → *Installed Operators* page, scroll or type a keyword into
81-
the *Filter by name* to find the Kiali Operator. Then, click on it.
75+
the *Filter by name* to find the Jaeger Operator. Then, click on it.
8276

8377
. On the right-hand side of the *Operator Details* page, select *Uninstall
8478
Operator* from the *Actions* drop-down menu.
@@ -114,59 +108,3 @@ Operator* from the *Actions* drop-down menu.
114108
check box if you want all components related to the installation to be removed.
115109
This removes the CSV, which in turn removes the pods, Deployments, CRDs, and CRs
116110
associated with the Operator.
117-
118-
[id="ossm-remove-cleanup_{context}"]
119-
== Clean up Operator resources
120-
121-
Follow this procedure to manually remove resources left behind after removing the {ProductName} Operator by using the OperatorHub interface.
122-
123-
.Prerequisites
124-
125-
* An account with cluster administration access.
126-
* Access to the {product-title} Command-line Interface (CLI) also known as `oc`.
127-
128-
.Procedure
129-
130-
. Log in to the {product-title} CLI as a cluster administrator.
131-
132-
. Run the following commands to clean up resources after uninstalling the Operators:
133-
+
134-
[NOTE]
135-
====
136-
Replace `<operator-project>` with the name of the project where the {ProductName} Operator was installed. This is typically `openshift-operators`.
137-
====
138-
+
139-
[source,terminal]
140-
----
141-
$ oc delete validatingwebhookconfiguration/<operator-project>.servicemesh-resources.maistra.io
142-
----
143-
+
144-
[source,terminal]
145-
----
146-
$ oc delete mutatingwebhookconfigurations/<operator-project>.servicemesh-resources.maistra.io
147-
----
148-
+
149-
[source,terminal]
150-
----
151-
$ oc delete -n <operator-project> daemonset/istio-node
152-
----
153-
+
154-
[source,terminal]
155-
----
156-
$ oc delete clusterrole/istio-admin clusterrole/istio-cni clusterrolebinding/istio-cni
157-
----
158-
+
159-
[source,terminal]
160-
----
161-
$ oc get crds -o name | grep '.*\.istio\.io' | xargs -r -n 1 oc delete
162-
----
163-
+
164-
[source,terminal]
165-
----
166-
$ oc get crds -o name | grep '.*\.maistra\.io' | xargs -r -n 1 oc delete
167-
----
168-
+
169-
[source,terminal]
170-
----
171-
$ oc get crds -o name | grep '.*\.kiali\.io' | xargs -r -n 1 oc delete
172-
----

‎service_mesh/v1x/removing-ossm.adoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ include::modules/ossm-member-roll-delete.adoc[leveloffset=+1]
1111

1212
include::modules/ossm-control-plane-remove.adoc[leveloffset=+1]
1313

14-
include::modules/ossm-operatorhub-remove.adoc[leveloffset=+1]
14+
include::modules/ossm-remove-operators.adoc[leveloffset=+1]
15+
16+
include::modules/ossm-remove-cleanup-1x.adoc[leveloffset=+2]

‎service_mesh/v2x/removing-ossm.adoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ include::modules/ossm-member-roll-delete.adoc[leveloffset=+1]
1111

1212
include::modules/ossm-control-plane-remove.adoc[leveloffset=+1]
1313

14-
include::modules/ossm-operatorhub-remove.adoc[leveloffset=+1]
14+
include::modules/ossm-remove-operators.adoc[leveloffset=+1]
15+
16+
include::modules/ossm-remove-cleanup.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)