From 6bb7d74cfb4bb898f2afa17323c8c60163e65679 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Wed, 27 Nov 2024 15:38:37 -0500 Subject: [PATCH] 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 cbea92581f, 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. --- .../kustomization.yaml | 0 .../operatorgroup.yaml | 2 +- .../kustomization.yaml | 0 .../subscription.yaml | 2 +- cluster-scope/bundles/virt/kustomization.yaml | 7 ++----- cluster-scope/overlays/nerc-ocp-test/kustomization.yaml | 1 + .../overlays/nerc-ocp-test/virt-patches/kustomization.yaml | 6 ++++++ 7 files changed, 11 insertions(+), 7 deletions(-) rename cluster-scope/base/operators.coreos.com/operatorgroups/{kubevirt-hyperconverged-group => kubevirt-hyperconverged}/kustomization.yaml (100%) rename cluster-scope/base/operators.coreos.com/operatorgroups/{kubevirt-hyperconverged-group => kubevirt-hyperconverged}/operatorgroup.yaml (78%) rename cluster-scope/base/operators.coreos.com/subscriptions/{hco-operatorhub => kubevirt-hyperconverged}/kustomization.yaml (100%) rename cluster-scope/base/operators.coreos.com/subscriptions/{hco-operatorhub => kubevirt-hyperconverged}/subscription.yaml (87%) create mode 100644 cluster-scope/overlays/nerc-ocp-test/virt-patches/kustomization.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/kustomization.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged/kustomization.yaml similarity index 100% rename from cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/kustomization.yaml rename to cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged/kustomization.yaml diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/operatorgroup.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged/operatorgroup.yaml similarity index 78% rename from cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/operatorgroup.yaml rename to cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged/operatorgroup.yaml index 9139f7dd..3c337188 100644 --- a/cluster-scope/base/operators.coreos.com/operatorgroups/kubevirt-hyperconverged-group/operatorgroup.yaml +++ b/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: diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/kubevirt-hyperconverged/kustomization.yaml similarity index 100% rename from cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/kustomization.yaml rename to cluster-scope/base/operators.coreos.com/subscriptions/kubevirt-hyperconverged/kustomization.yaml diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/kubevirt-hyperconverged/subscription.yaml similarity index 87% rename from cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/subscription.yaml rename to cluster-scope/base/operators.coreos.com/subscriptions/kubevirt-hyperconverged/subscription.yaml index 9ba021e3..ec2794a5 100644 --- a/cluster-scope/base/operators.coreos.com/subscriptions/hco-operatorhub/subscription.yaml +++ b/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 diff --git a/cluster-scope/bundles/virt/kustomization.yaml b/cluster-scope/bundles/virt/kustomization.yaml index 131617a1..f599d16c 100644 --- a/cluster-scope/bundles/virt/kustomization.yaml +++ b/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 diff --git a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml index 334fa7e2..ae406ea1 100644 --- a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml @@ -18,6 +18,7 @@ resources: - feature/odf - feature/rhoai - rbac +- virt-patches - ../../bundles/clusterissuer-http01 - ../../bundles/gatekeeper-operator - ../../bundles/hostpath-provisioner diff --git a/cluster-scope/overlays/nerc-ocp-test/virt-patches/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/virt-patches/kustomization.yaml new file mode 100644 index 00000000..5e4855e0 --- /dev/null +++ b/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