Fix some issues with virt bundle

- We are installing  a subscription for the `kubevirt-hyperconverged`
  operator, but the subscription was named `hco-operatorhub`.

- The operatorgroup had an unnecessary `-group` suffix, which doesn't match
  our other installs.

- The bundle included resources which, according to cbea925, it's not
  clear if we need or not. Move this into the test cluster overlay for now
  in line with the comment in that commit.

cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/operatorgroup.yaml → cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged/operatorgroup.yaml

@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: kubevirt-hyperconverged-group
+  name: kubevirt-hyperconverged
   namespace: openshift-cnv
 spec:
   targetNamespaces:

cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/subscription.yaml → cluster-scope/base/operators.coreos.com/subscriptions/kubevirt-hyperconverged/subscription.yaml

@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: hco-operatorhub
+  name: kubevirt-hyperconverged
   namespace: openshift-cnv
 spec:
   source: redhat-operators

cluster-scope/bundles/virt/kustomization.yaml

@@ -4,8 +4,5 @@ commonLabels:
   nerc.mghpcc.org/bundle: virt
 resources:
   - ../../base/core/namespaces/openshift-cnv
-  - ../../base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group
-  - ../../base/operators.coreos.com/subscriptions/hco-operatorhub
-  - ../../base/core/configmaps/kubevirt
-  - ../../base/rbac.authorization.k8s.io/roles/kubevirt
-  - ../../base/rbac.authorization.k8s.io/rolebindings/kubevirt
+  - ../../base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged
+  - ../../base/operators.coreos.com/subscriptions/kubevirt-hyperconverged

cluster-scope/overlays/nerc-ocp-test/kustomization.yaml

@@ -17,6 +17,7 @@ resources:
 - nodenetworkconfigurationpolicies
 - feature/odf
 - feature/rhoai
+- virt-patches
 - ../../bundles/clusterissuer-http01
 - ../../bundles/gatekeeper-operator
 - ../../bundles/hostpath-provisioner

cluster-scope/overlays/nerc-ocp-test/virt-patches/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../../base/core/configmaps/kubevirt
+- ../../../base/rbac.authorization.k8s.io/roles/kubevirt
+- ../../../base/rbac.authorization.k8s.io/rolebindings/kubevirt