Flattened

RHsyseng · Jul 1, 2021 · d579952 · d579952
1 parent 6cf5eb2
commit d579952
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/hyperconverged/kustomization.yaml b/hyperconverged/kustomization.yaml
diff --git a/kubevirt/catalog_source.yaml b/kubevirt/catalog_source.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: hco-unstable-catalog-source
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  image: quay.io/kubevirt/hyperconverged-cluster-index:1.5.0-unstable
+  displayName: Kubevirt Hyperconverged Cluster Operator
+  publisher: Kubevirt Project
diff --git a/hyperconverged/base/hco_cr.yaml → kubevirt/hco_cr.yaml b/hyperconverged/base/hco_cr.yaml → kubevirt/hco_cr.yaml
diff --git a/hyperconverged/base/kustomization.yaml → kubevirt/kustomization.yaml b/hyperconverged/base/kustomization.yaml → kubevirt/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kubevirt-hyperconverged
 
 resources:
+  - catalog_source.yaml
   - operator_group.yaml
   - subscription.yaml
   - hco_cr.yaml
diff --git a/hyperconverged/namespace.yaml → kubevirt/namespace.yaml b/hyperconverged/namespace.yaml → kubevirt/namespace.yaml
diff --git a/hyperconverged/base/operator_group.yaml → kubevirt/operator_group.yaml b/hyperconverged/base/operator_group.yaml → kubevirt/operator_group.yaml
@@ -2,4 +2,5 @@ apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: kubevirt-hyperconverged-group
+  namespace: kubevirt-hyperconverged
 spec: {}
diff --git a/hyperconverged/base/subscription.yaml → kubevirt/subscription.yaml b/hyperconverged/base/subscription.yaml → kubevirt/subscription.yaml
@@ -2,9 +2,10 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: hco-operatorhub
+  namespace: kubevirt-hyperconverged
 spec:
   source: kubevirt-hyperconverged
-  sourceNamespace: kubevirt-hyperconverged
+  sourceNamespace: openshift-marketplace
   name: community-kubevirt-hyperconverged
   startingCSV: kubevirt-hyperconverged-operator.v1.5.0
   channel: "1.5.0"