MRO has an extra comma also add it and Metrics to the merger in file (#…

…230)
kubevirt · Aug 20, 2019 · 626df20 · 626df20
1 parent 06d9b0a
commit 626df20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/...t-hyperconverged/0.0.2/kubevirt-hyperconverged-operator.v0.0.2.clusterserviceversion.yaml b/...t-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/...rconverged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion.yaml.in b/...rconverged/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/...ged/VERSION/kubevirt-hyperconverged-operator.VERSION.clusterserviceversion_merger.yaml.in b/...ged/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",