Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Operator deletion language #18632

Merged
merged 1 commit into from
Dec 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions modules/olm-deleting-operators-from-a-cluster-using-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
[id="olm-deleting-operator-from-a-cluster-using-cli_{context}"]
= Deleting Operators from a cluster using the CLI

Instead of using the {product-title} web console, you can delete an Operator
from your cluster by using the CLI. You do this by deleting the Subscription and
CSV from the target namespace.
Cluster administrators can delete installed Operators from a selected namespace
by using the CLI.

.Prerequisites

Expand All @@ -18,7 +17,7 @@ endif::[]
ifdef::openshift-dedicated[]
`dedicated-admins-cluster` permissions.
endif::[]
- Install the `oc` command on your local system.
- `oc` command installed on workstation.

.Procedure

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,18 @@
[id="olm-deleting-operators-from-a-cluster-using-web-console_{context}"]
= Deleting Operators from a cluster using the web console

To delete an installed Operator from the selected namespace through the web
console, follow these steps:
Cluster administrators can delete installed Operators from a selected namespace
by using the web console.

.Prerequisites

- Access to an {product-title} cluster web console using an account with
ifdef::openshift-enterprise,openshift-origin[]
`cluster-admin` permissions.
endif::[]
ifdef::openshift-dedicated[]
`dedicated-admins-cluster` permissions.
endif::[]

.Procedure

Expand All @@ -16,10 +26,10 @@ the *Filter by name* to find the Operator you want. Then, click on it.
. On the right-hand side of the *Operator Details* page, select *Uninstall
Operator* from the *Actions* drop-down menu.

. When prompted by the *Remove Operator Subscription* window, optionally select the
*Also completely remove the Operator from the selected namespace*
check box if you want all components related to the installation to be removed.
This removes the CSV, which in turn removes the Pods, Deployments, CRDs, and CRs
associated with the Operator.
. When prompted by the *Remove Operator Subscription* window, you can select the
*Also completely remove the Operator from the selected namespace* check box to
remove all components related to the Operator. This removes the CSV, which
in turn removes the Pods, Deployments, CRDs, and CRs associated with the
Operator. Leaving this unchecked results in only the Subscription being removed.

. Select *Remove*. This Operator will stop running and no longer receive updates.
7 changes: 1 addition & 6 deletions operators/olm-deleting-operators-from-cluster.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ include::modules/common-attributes.adoc[]

toc::[]

To delete, or uninstall, an Operator from your cluster, you can simply delete
the Subscription to remove it from the subscribed namespace. If you want a clean
slate, you can also remove the Operator's ClusterServiceVersion (CSV) and
Deployment.

The following describes how to delete Operators from a cluster using either the
web console or the command line.
web console or the CLI.

include::modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc[leveloffset=+1]
include::modules/olm-deleting-operators-from-a-cluster-using-cli.adoc[leveloffset=+1]