From f16af08ad664ab25d105d52da95ed64d1bda0427 Mon Sep 17 00:00:00 2001 From: Tim O'Keefe Date: Tue, 16 Aug 2022 13:06:00 -0400 Subject: [PATCH] OSSMDOC-658: Add missing steps to removing Clean up Operator Resources topic --- modules/ossm-remove-cleanup-1x.adoc | 2 +- modules/ossm-remove-cleanup.adoc | 26 +++++++++----------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/modules/ossm-remove-cleanup-1x.adoc b/modules/ossm-remove-cleanup-1x.adoc index 2db4fe27d580..7a05554b5595 100644 --- a/modules/ossm-remove-cleanup-1x.adoc +++ b/modules/ossm-remove-cleanup-1x.adoc @@ -32,7 +32,7 @@ $ oc delete validatingwebhookconfiguration/openshift-operators.servicemesh-resou + [source,terminal] ---- -$ oc delete mutatingwebhookconfigurations/openshift-operators.servicemesh-resources.maistra.io +$ oc delete mutatingwebhookconfiguration/openshift-operators.servicemesh-resources.maistra.io ---- + [source,terminal] diff --git a/modules/ossm-remove-cleanup.adoc b/modules/ossm-remove-cleanup.adoc index 3d988cc446ac..d49da78ce15c 100644 --- a/modules/ossm-remove-cleanup.adoc +++ b/modules/ossm-remove-cleanup.adoc @@ -32,7 +32,7 @@ $ oc delete validatingwebhookconfiguration/openshift-operators.servicemesh-resou + [source,terminal] ---- -$ oc delete mutatingwebhookconfigurations/openshift-operators.servicemesh-resources.maistra.io +$ oc delete mutatingwebhookconfiguration/openshift-operators.servicemesh-resources.maistra.io ---- + [source,terminal] @@ -40,23 +40,10 @@ $ oc delete mutatingwebhookconfigurations/openshift-operators.servicemesh-resour $ oc delete svc maistra-admission-controller -n openshift-operators ---- + --- -Delete the daemonset - -* For {SMProductName} version 2.1.x and earlier -+ -[source,terminal] ----- -$ oc delete -n openshift-operators daemonset/istio-node ----- -+ -* For {SMProductName} version 2.2.0 and later -+ [source,terminal] ---- -$ oc delete -n openshift-operators daemonset/istio-cni-node +$ oc -n openshift-operators delete ds -lmaistra-version ---- --- + [source,terminal] ---- @@ -95,10 +82,15 @@ $ oc delete crds jaegers.jaegertracing.io + [source,terminal] ---- -$ oc delete secret -n openshift-operators maistra-operator-serving-cert +$ oc delete cm -n openshift-operators maistra-operator-cabundle ---- + [source,terminal] ---- -$ oc delete cm -n openshift-operators maistra-operator-cabundle +$ oc delete cm -n openshift-operators istio-cni-config +---- ++ +[source,terminal] +---- +$ oc delete sa -n openshift-operators istio-cni ----