Skip to content

bz 1790533: CNV Operator name update for 4.3 #19317

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 30, 2020
Merged

bz 1790533: CNV Operator name update for 4.3 #19317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cnv/cnv-install/installing-container-native-virtualization.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ include::modules/technology-preview.adoc[leveloffset=+1]

include::modules/cnv-preparing-to-install.adoc[leveloffset=+1]

include::modules/cnv-subscribing-to-hco-catalog.adoc[leveloffset=+2]
include::modules/cnv-subscribing-to-the-catalog.adoc[leveloffset=+1]

include::modules/cnv-deploying-cnv.adoc[leveloffset=+1]
4 changes: 2 additions & 2 deletions cnv/cnv-install/uninstalling-container-native-virtualization.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ xref:../../web-console/web-console.adoc#web-console-overview_web-console[web con

.Prerequisites

* {CNVProductNameStart} 2.1
* {CNVProductNameStart} {CNVVersion}

include::modules/cnv-deleting-custom-resource.adoc[leveloffset=+1]

include::modules/cnv-deleting-hco-subscription.adoc[leveloffset=+1]
include::modules/cnv-deleting-catalog-subscription.adoc[leveloffset=+1]

[NOTE]
====
Expand Down
2 changes: 1 addition & 1 deletion cnv/cnv-release-notes/cnv-release-notes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ nodes.
from the Operator Lifecycle Manager (OLM). This issue is caused by the limitations
associated with using a declarative API to track the state of {CNVProductName}
Operators. Enabling automatic updates during
xref:../cnv-install/installing-container-native-virtualization.adoc#cnv-subscribing-to-hco-catalog_installing-container-native-virtualization[installation]
xref:../cnv-install/installing-container-native-virtualization.adoc#cnv-subscribing-to-the-catalog_installing-container-native-virtualization[installation]
decreases the risk of encountering this issue.
(link:https://bugzilla.redhat.com/show_bug.cgi?id=1759612[*BZ#1759612*])

Expand Down
2 changes: 1 addition & 1 deletion cnv/upgrading-container-native-virtualization.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include::modules/cnv-document-attributes.adoc[]
:context: upgrading-container-native-virtualization
toc::[]

You enable automatic updates during {CNVProductName} xref:../cnv/cnv-install/installing-container-native-virtualization.adoc#cnv-subscribing-to-hco-catalog_installing-container-native-virtualization[installation].
You enable automatic updates during {CNVProductName} xref:../cnv/cnv-install/installing-container-native-virtualization.adoc#cnv-subscribing-to-the-catalog_installing-container-native-virtualization[installation].
Learn what to expect and how you can check the status of an update in progress.

:FeatureName: {CNVProductNameStart}
Expand Down
21 changes: 21 additions & 0 deletions modules/cnv-deleting-catalog-subscription.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Module included in the following assemblies:
//
// * cnv/cnv_install/uninstalling-container-native-virtualization.adoc

[id="cnv-deleting-catalog-subscription_{context}"]
= Deleting the {CNVProductNameStart} catalog subscription

To finish uninstalling {CNVProductName}, delete the
*{CNVProductNameStart}* catalog subscription.

.Prerequisites

* An active subscription to the *{CNVProductNameStart}* catalog

.Procedure

. Navigate to the *Operators* -> *OperatorHub* page.

. Search for *{CNVProductNameStart}* and then select it.

. Click *Uninstall*.
19 changes: 6 additions & 13 deletions modules/cnv-deleting-custom-resource.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// * cnv/cnv_install/uninstalling-container-native-virtualization.adoc

[id="cnv-deleting-kubevirt-hyperconverged-custom-resource_{context}"]
= Deleting the KubeVirt HyperConverged custom resource
= Deleting the KubeVirt HyperConverged Cluster Operator Deployment custom resource

To uninstall {CNVProductName}, you must first delete the
*KubeVirt HyperConverged Cluster Operator Deployment* custom resource.
Expand All @@ -19,29 +19,22 @@ the *Projects* list.

. Navigate to the *Operators* -> *Installed Operators* page.

. Click *KubeVirt HyperConverged Cluster Operator*.
. Click *{CNVProductNameStart}*.

. Click the *KubeVirt HyperConverged Cluster Operator Deployment* tab.

. Click the Options menu {kebab} in the row containing the *hyperconverged-cluster*
custom resource. In the expanded menu, click *Delete HyperConverged*.
. Click the Options menu {kebab} in the row containing the *kubevirt-hyperconverged*
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{CNVProductNameStart} instead of kubevirt-hyperconverged?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nellyc The custom resource itself is called kubevirt-hyperconverged in the most recent screenshot I received from @alexxa (under "Hyper Convergeds")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From @alexxa: according to CNV CSV 2.2 version, line #12, the correct name is kubevirt-hyperconverged

custom resource. In the expanded menu, click *Delete HyperConverged Cluster*.

. Click *Delete* in the confirmation window.

. Navigate to the *Workloads* -> *Pods* page to verify that only the Operator
Pods are running.

. Open a terminal window and clean up the remaining KubeVirt resources by running
. Open a terminal window and clean up the remaining resources by running
the following command:
+
----
$ oc delete apiservices v1alpha3.subresources.kubevirt.io -n openshift-cnv
----
+
[NOTE]
====
Because some KubeVirt resources are currently improperly retained, you must
manually remove them. These resources will be removed automatically after
(link:https://bugzilla.redhat.com/show_bug.cgi?id=1712429[*BZ1712429*]) is
resolved.
====

21 changes: 0 additions & 21 deletions modules/cnv-deleting-hco-subscription.adoc
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions modules/cnv-deploying-cnv.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@
// * cnv/cnv_install/installing-container-native-virtualization.adoc

[id="cnv-deploying-cnv_{context}"]
= Deploying container-native virtualization
= Deploying {CNVProductName}

After subscribing to the *KubeVirt HyperConverged Cluster Operator* catalog,
After subscribing to the *{CNVProductNameStart}* catalog,
create the *KubeVirt HyperConverged Cluster Operator Deployment* custom resource
to deploy {CNVProductName}.

.Prerequisites

* An active subscription to the *KubeVirt HyperConverged Cluster Operator* catalog
in the `openshift-cnv` namespace
* An active subscription to the *{CNVProductNameStart}* catalog in the `openshift-cnv` namespace

.Procedure

. Navigate to the *Operators* -> *Installed Operators* page.

. Click *KubeVirt HyperConverged Cluster Operator*.
. Click *{CNVProductNameStart}*.

. Click the *KubeVirt HyperConverged Cluster Operator Deployment* tab and click
*Create HyperConverged Cluster*.
Expand Down
2 changes: 1 addition & 1 deletion modules/cnv-monitoring-upgrade-status.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ VERSION REPLACES PHASE
conditions by running the following command:
+
----
$ oc get hco -n openshift-cnv hyperconverged-cluster \
$ oc get hco -n openshift-cnv kubevirt-hyperconverged \
-o=jsonpath='{range .status.conditions[*]}{.type}{"\t"}{.status}{"\t"}{.message}{"\n"}{end}'
----
+
Expand Down
17 changes: 8 additions & 9 deletions modules/cnv-subscribing-to-hco-catalog.adoc → modules/cnv-subscribing-to-the-catalog.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
//
// * cnv/cnv_install/installing-container-native-virtualization.adoc

[id="cnv-subscribing-to-hco-catalog_{context}"]
= Subscribing to the KubeVirt HyperConverged Cluster Operator catalog
[id="cnv-subscribing-to-the-catalog_{context}"]
= Subscribing to the {CNVProductNameStart} catalog

Before you install {CNVProductName}, subscribe to the
*KubeVirt HyperConverged Cluster Operator* catalog from
the {product-title} web console. Subscribing gives the `openshift-cnv`
namespace access to the {CNVProductName} Operators.
*{CNVProductNameStart}* catalog from the {product-title} web console.
Subscribing gives the `openshift-cnv` namespace access to the {CNVProductName}
Operators.

.Prerequisites

Expand All @@ -20,7 +20,7 @@ namespace access to the {CNVProductName} Operators.

. Navigate to the *Operators* → *OperatorHub* page.

. Locate the *KubeVirt HyperConverged Cluster Operator* and then select it.
. Search for *{CNVProductNameStart}* and then select it.

. Read the information about the Operator and click *Install*.

Expand All @@ -35,11 +35,10 @@ list and choose the `openshift-cnv` namespace.
in the cluster. This option is *not* supported for use with {CNVProductName}.
You must only install the Operator in the `openshift-cnv` namespace.
====
.. Select *2.1* from the list of available *Update Channel* options.
.. Select *{CNVVersion}* from the list of available *Update Channel* options.
.. For *Approval Strategy*, ensure that *Automatic*, which is the default value,
is selected.
{CNVProductNameStart} automatically updates when a new z-stream release is
available.

. Click *Subscribe* to make the Operator available to the selected namespaces on
this {product-title} cluster.
. Click *Subscribe* to make the Operator available to the `openshift-cnv` namespace.