From 626df2072060eb195cf03daf3068496fc2a52ecc Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Tue, 20 Aug 2019 13:05:13 -0400 Subject: [PATCH] MRO has an extra comma also add it and Metrics to the merger in file (#230) --- Gopkg.lock | 1 + ...rged-operator.v0.0.2.clusterserviceversion.yaml | 4 ++-- ...-operator.VERSION.clusterserviceversion.yaml.in | 2 +- ...or.VERSION.clusterserviceversion_merger.yaml.in | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index c3876883e7..2041a069b4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1344,6 +1344,7 @@ "github.com/openshift/api/security/v1", "github.com/openshift/custom-resource-status/conditions/v1", "github.com/openshift/custom-resource-status/objectreferences/v1", + "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1", "github.com/operator-framework/operator-sdk/pkg/k8sutil", "github.com/operator-framework/operator-sdk/pkg/kube-metrics", "github.com/operator-framework/operator-sdk/pkg/leader", diff --git a/deploy/olm-catalog/kubevirt-hyperconverged/0.0.2/kubevirt-hyperconverged-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/kubevirt-hyperconverged/0.0.2/kubevirt-hyperconverged-operator.v0.0.2.clusterserviceversion.yaml index e25b9738de..5de603f2ad 100644 --- a/deploy/olm-catalog/kubevirt-hyperconverged/0.0.2/kubevirt-hyperconverged-operator.v0.0.2.clusterserviceversion.yaml +++ b/deploy/olm-catalog/kubevirt-hyperconverged/0.0.2/kubevirt-hyperconverged-operator.v0.0.2.clusterserviceversion.yaml @@ -66,7 +66,7 @@ metadata: "apiVersion": "machineremediation.kubevirt.io/v1alpha1", "kind": "MachineRemediationOperator", "metadata": { - "name": "mro", + "name": "mro" } }, { @@ -85,7 +85,7 @@ metadata: categories: OpenShift Optional certified: 'false' containerImage: quay.io/kubevirt/hyperconverged-cluster-operator:latest - createdAt: 2019-08-15 16:34:10.428354276 +0300 IDT m=+0.036956029 + createdAt: 2019-08-20 09:32:40.412571647 -0400 EDT m=+0.028283780 description: Creates and maintains a HyperConverged KubeVirt Deployment repository: https://github.com/kubevirt/hyperconverged-cluster-operator support: 'false' diff --git a/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion.yaml.in b/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion.yaml.in index 4ef45502e0..7468e47b64 100644 --- a/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion.yaml.in +++ b/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion.yaml.in @@ -66,7 +66,7 @@ metadata: "apiVersion": "machineremediation.kubevirt.io/v1alpha1", "kind": "MachineRemediationOperator", "metadata": { - "name": "mro", + "name": "mro" } }, { diff --git a/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion_merger.yaml.in b/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion_merger.yaml.in index 32a7d00131..6714336826 100644 --- a/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion_merger.yaml.in +++ b/templates/olm-catalog/kubevirt-hyperconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion_merger.yaml.in @@ -55,6 +55,20 @@ metadata: "name": "template-validator" } }, + { + "apiVersion": "kubevirtmetricsaggregations.kubevirt.io/v1", + "kind": "KubevirtMetricsAggregation", + "metadata": { + "name": "metrics-aggregation" + } + }, + { + "apiVersion": "machineremediation.kubevirt.io/v1alpha1", + "kind": "MachineRemediationOperator", + "metadata": { + "name": "mro" + } + }, { "apiVersion": "kubevirt.io/v1alpha1", "kind": "NodeMaintenance",