Bump NMO to 0.5.0

Signed-off-by: Simone Tiraboschi <[email protected]>
kubevirt · Apr 23, 2020 · 5364afb · 5364afb
1 parent c9da479
commit 5364afb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml
@@ -1161,7 +1161,7 @@ rules:
   - get
   - create
 - apiGroups:
-  - kubevirt.io
+  - nodemaintenance.kubevirt.io
   resources:
   - '*'
   verbs:

diff --git a/deploy/crds/node-maintenance00.crd.yaml b/deploy/crds/node-maintenance00.crd.yaml
@@ -2,9 +2,9 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: nodemaintenances.kubevirt.io
+  name: nodemaintenances.nodemaintenance.kubevirt.io
 spec:
-  group: kubevirt.io
+  group: nodemaintenance.kubevirt.io
   names:
     kind: NodeMaintenance
     listKind: NodeMaintenanceList
@@ -65,8 +65,8 @@ spec:
               format: int64
               type: integer
           type: object
-  version: v1alpha1
+  version: v1beta1
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     served: true
     storage: true
diff --git a/...t-hyperconverged/1.1.0/kubevirt-hyperconverged-operator.v1.1.0.clusterserviceversion.yaml b/...t-hyperconverged/1.1.0/kubevirt-hyperconverged-operator.v1.1.0.clusterserviceversion.yaml
@@ -3,13 +3,13 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[{"apiVersion":"hco.kubevirt.io/v1alpha1","kind":"HyperConverged","metadata":{"name":"kubevirt-hyperconverged","namespace":"kubevirt-hyperconverged"},"spec":{"BareMetalPlatform":false}},{"apiVersion":"networkaddonsoperator.network.kubevirt.io/v1alpha1","kind":"NetworkAddonsConfig","metadata":{"name":"cluster"},"spec":{"imagePullPolicy":"IfNotPresent","kubeMacPool":{"rangeEnd":"FD:FF:FF:FF:FF:FF","rangeStart":"02:00:00:00:00:00"},"linuxBridge":{},"multus":{},"nmstate":{},"ovs":{}}},{"apiVersion":"kubevirt.io/v1alpha3","kind":"KubeVirt","metadata":{"name":"kubevirt","namespace":"kubevirt"},"spec":{"imagePullPolicy":"Always"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2,"version":"v0.6.2"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle"},"spec":{"version":"v0.7.0"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation"},"spec":{"version":"v0.0.1"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtNodeLabellerBundle","metadata":{"name":"kubevirt-node-labeller-bundle"},"spec":{"version":"v0.1.1"}},{"apiVersion":"cdi.kubevirt.io/v1alpha1","kind":"CDI","metadata":{"name":"cdi","namespace":"cdi"},"spec":{"imagePullPolicy":"IfNotPresent"}},{"apiVersion":"kubevirt.io/v1alpha1","kind":"NodeMaintenance","metadata":{"name":"nodemaintenance-xyz"},"spec":{"nodeName":"node02","reason":"Test
+    alm-examples: '[{"apiVersion":"hco.kubevirt.io/v1alpha1","kind":"HyperConverged","metadata":{"name":"kubevirt-hyperconverged","namespace":"kubevirt-hyperconverged"},"spec":{"BareMetalPlatform":false}},{"apiVersion":"networkaddonsoperator.network.kubevirt.io/v1alpha1","kind":"NetworkAddonsConfig","metadata":{"name":"cluster"},"spec":{"imagePullPolicy":"IfNotPresent","kubeMacPool":{"rangeEnd":"FD:FF:FF:FF:FF:FF","rangeStart":"02:00:00:00:00:00"},"linuxBridge":{},"multus":{},"nmstate":{},"ovs":{}}},{"apiVersion":"kubevirt.io/v1alpha3","kind":"KubeVirt","metadata":{"name":"kubevirt","namespace":"kubevirt"},"spec":{"imagePullPolicy":"Always"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2,"version":"v0.6.2"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle"},"spec":{"version":"v0.7.0"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation"},"spec":{"version":"v0.0.1"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtNodeLabellerBundle","metadata":{"name":"kubevirt-node-labeller-bundle"},"spec":{"version":"v0.1.1"}},{"apiVersion":"cdi.kubevirt.io/v1alpha1","kind":"CDI","metadata":{"name":"cdi","namespace":"cdi"},"spec":{"imagePullPolicy":"IfNotPresent"}},{"apiVersion":"nodemaintenance.kubevirt.io/v1beta1","kind":"NodeMaintenance","metadata":{"name":"nodemaintenance-xyz"},"spec":{"nodeName":"node02","reason":"Test
       node maintenance"}}]'
     capabilities: Full Lifecycle
     categories: OpenShift Optional
     certified: "false"
     containerImage: quay.io/kubevirt/hyperconverged-cluster-operator:1.1.0
-    createdAt: "2020-04-20 10:08:57"
+    createdAt: "2020-04-23 10:00:11"
     description: |-
       **HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products.
       Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt,
@@ -76,7 +76,7 @@ metadata:
       KubeVirt is distributed under the
       [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt).
     operatorframework.io/suggested-namespace: kubevirt-hyperconverged
-    operators.operatorframework.io/internal-objects: '["v2vvmwares.v2v.kubevirt.io","networkaddonsconfigs.networkaddonsoperator.network.kubevirt.io","kubevirts.kubevirt.io","kubevirtcommontemplatesbundles.ssp.kubevirt.io","kubevirtmetricsaggregations.ssp.kubevirt.io","kubevirtnodelabellerbundles.ssp.kubevirt.io","kubevirttemplatevalidators.ssp.kubevirt.io","cdis.cdi.kubevirt.io","nodemaintenances.kubevirt.io"]'
+    operators.operatorframework.io/internal-objects: '["v2vvmwares.v2v.kubevirt.io","networkaddonsconfigs.networkaddonsoperator.network.kubevirt.io","kubevirts.kubevirt.io","kubevirtcommontemplatesbundles.ssp.kubevirt.io","kubevirtmetricsaggregations.ssp.kubevirt.io","kubevirtnodelabellerbundles.ssp.kubevirt.io","kubevirttemplatevalidators.ssp.kubevirt.io","cdis.cdi.kubevirt.io","nodemaintenances.nodemaintenance.kubevirt.io"]'
     repository: https://github.com/kubevirt/hyperconverged-cluster-operator
     support: "false"
   name: kubevirt-hyperconverged-operator.v1.1.0
@@ -131,11 +131,9 @@ spec:
       kind: CDI
       name: cdis.cdi.kubevirt.io
       version: v1alpha1
-    - description: Represents a deployment of node maintenance crd
-      displayName: KubeVirt node maintenance
-      kind: NodeMaintenance
-      name: nodemaintenances.kubevirt.io
-      version: v1alpha1
+    - kind: NodeMaintenance
+      name: nodemaintenances.nodemaintenance.kubevirt.io
+      version: v1beta1
   description: |-
     **HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products.
     Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt,
@@ -1262,7 +1260,7 @@ spec:
           - get
           - create
         - apiGroups:
-          - kubevirt.io
+          - nodemaintenance.kubevirt.io
           resources:
           - '*'
           verbs:
@@ -1543,7 +1541,7 @@ spec:
                       fieldPath: metadata.name
                 - name: OPERATOR_NAME
                   value: node-maintenance-operator
-                image: quay.io/kubevirt/node-maintenance-operator:v0.4.0
+                image: quay.io/kubevirt/node-maintenance-operator:v0.5.0
                 imagePullPolicy: Always
                 name: node-maintenance-operator
                 resources: {}

diff --git a/deploy/olm-catalog/kubevirt-hyperconverged/1.1.0/node-maintenance00.crd.yaml b/deploy/olm-catalog/kubevirt-hyperconverged/1.1.0/node-maintenance00.crd.yaml
@@ -2,9 +2,9 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: nodemaintenances.kubevirt.io
+  name: nodemaintenances.nodemaintenance.kubevirt.io
 spec:
-  group: kubevirt.io
+  group: nodemaintenance.kubevirt.io
   names:
     kind: NodeMaintenance
     listKind: NodeMaintenanceList
@@ -65,8 +65,8 @@ spec:
               format: int64
               type: integer
           type: object
-  version: v1alpha1
+  version: v1beta1
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     served: true
     storage: true
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -302,7 +302,7 @@ spec:
               fieldPath: metadata.name
         - name: OPERATOR_NAME
           value: node-maintenance-operator
-        image: quay.io/kubevirt/node-maintenance-operator:v0.4.0
+        image: quay.io/kubevirt/node-maintenance-operator:v0.5.0
         imagePullPolicy: Always
         name: node-maintenance-operator
         resources: {}

diff --git a/hack/config b/hack/config
@@ -4,7 +4,7 @@ KUBEVIRT_VERSION="v0.26.0"
 CDI_VERSION="v1.13.1"
 NETWORK_ADDONS_VERSION="0.27.7"
 SSP_VERSION="v1.0.30"
-NMO_VERSION="v0.4.0"
+NMO_VERSION="v0.5.0"
 HPPO_VERSION="v0.2.8"
 HPP_VERSION="v0.2.2"
 CONVERSION_CONTAINER_VERSION="v2.0.0"