Skip to content

Commit

Permalink
Fix some issues with virt bundle
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
larsks committed Dec 16, 2024
1 parent 56c7b15 commit 6bb7d74
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: operators.coreos.com/v1
kind: OperatorGroup
metadata:
name: kubevirt-hyperconverged-group
name: kubevirt-hyperconverged
namespace: openshift-cnv
spec:
targetNamespaces:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 2 additions & 5 deletions cluster-scope/bundles/virt/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions cluster-scope/overlays/nerc-ocp-test/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ resources:
- feature/odf
- feature/rhoai
- rbac
- virt-patches
- ../../bundles/clusterissuer-http01
- ../../bundles/gatekeeper-operator
- ../../bundles/hostpath-provisioner
Expand Down
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6bb7d74

Please sign in to comment.