Skip to content

Commit

Permalink
Merge pull request #67305 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-67289-to-enterprise-4.13

[enterprise-4.13] OBSDOCS-152: Removing duplicated uninstall content
  • Loading branch information
abrennan89 committed Nov 2, 2023
2 parents ece2e4f + 3d551b4 commit 59e2542
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 24 deletions.
13 changes: 7 additions & 6 deletions logging/cluster-logging-uninstall.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ toc::[]

You can remove the {logging} from your {product-title} cluster.

// The following include statements pull in the module files that comprise
// the assembly. Include any combination of concept, procedure, or reference
// modules required to cover the user story. You can also include other
// assemblies.

include::modules/cluster-logging-uninstall.adoc[leveloffset=+1]

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

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

[role="_additional-resources"]
.Additional resources
ifdef::openshift-enterprise,openshift-origin[]
* xref:../storage/understanding-persistent-storage.adoc#reclaim-manual_understanding-persistent-storage[Reclaiming a persistent volume manually]
endif::[]
ifdef::openshift-rosa,openshift-dedicated[]
* link:https://docs.openshift.com/container-platform/latest/storage/understanding-persistent-storage.html#reclaim-manual_understanding-persistent-storage[Reclaiming a persistent volume manually]
endif::[]
endif::[]
6 changes: 0 additions & 6 deletions logging/v5_5/logging-5-5-administration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]

//Generic installing operators from operator hub using CLI
include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]

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

//Generic deleting operators from a cluster using CLI
include::modules/olm-deleting-operators-from-a-cluster-using-cli.adoc[leveloffset=+1]
6 changes: 0 additions & 6 deletions logging/v5_6/logging-5-6-administration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]

//Generic installing operators from operator hub using CLI
include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]

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

//Generic deleting operators from a cluster using CLI
include::modules/olm-deleting-operators-from-a-cluster-using-cli.adoc[leveloffset=+1]
6 changes: 0 additions & 6 deletions logging/v5_7/logging-5-7-administration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ include::modules/logging-deploy-loki-console.adoc[leveloffset=+1]

//Generic installing operators from operator hub using CLI
include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]

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

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

0 comments on commit 59e2542

Please sign in to comment.