bump cnao to 0.15.0 (#274)

Contains KubeMacPool fixes and stability improvements. Signed-off-by: Petr Horacek <phoracek@redhat.com>
kubevirt · Sep 3, 2019 · fea20b5 · fea20b5
1 parent 7613f80
commit fea20b5
Show file tree

Hide file tree

Showing 19 changed files with 176 additions and 22 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -35,7 +35,7 @@ required = [
 
 [[override]]
   name = "github.com/kubevirt/cluster-network-addons-operator"
-  version = "=0.13.0"
+  version = "=0.15.0"
 
 [[override]]
   name = "github.com/MarSik/kubevirt-ssp-operator"

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
@@ -95,7 +95,7 @@ metadata:
     categories: OpenShift Optional
     certified: 'false'
     containerImage: quay.io/kubevirt/hyperconverged-cluster-operator:latest
-    createdAt: 2019-09-03 15:43:27.61039013 +0300 IDT m=+0.025400476
+    createdAt: 2019-09-03 21:22:29.688186557 +0200 CEST m=+0.036522946
     description: Creates and maintains a HyperConverged KubeVirt Deployment
     repository: https://github.com/kubevirt/hyperconverged-cluster-operator
     support: 'false'
@@ -1454,13 +1454,13 @@ spec:
                   - name: OVS_MARKER_IMAGE
                     value: quay.io/kubevirt/ovs-cni-marker:v0.7.0
                   - name: KUBEMACPOOL_IMAGE
-                    value: quay.io/kubevirt/kubemacpool:v0.4.0
+                    value: quay.io/kubevirt/kubemacpool:v0.5.0
                   - name: OPERATOR_IMAGE
-                    value: quay.io/kubevirt/cluster-network-addons-operator:0.13.0
+                    value: quay.io/kubevirt/cluster-network-addons-operator:0.15.0
                   - name: OPERATOR_NAME
                     value: cluster-network-addons-operator
                   - name: OPERATOR_VERSION
-                    value: 0.13.0
+                    value: 0.15.0
                   - name: OPERATOR_NAMESPACE
                     valueFrom:
                       fieldRef:
@@ -1470,7 +1470,7 @@ spec:
                       fieldRef:
                         fieldPath: metadata.name
                   - name: WATCH_NAMESPACE
-                  image: quay.io/kubevirt/cluster-network-addons-operator:0.13.0
+                  image: quay.io/kubevirt/cluster-network-addons-operator:0.15.0
                   imagePullPolicy: IfNotPresent
                   name: cluster-network-addons-operator
                   resources: {}

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -166,7 +166,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    networkaddonsoperator.network.kubevirt.io/version: 0.13.0
+    networkaddonsoperator.network.kubevirt.io/version: 0.15.0
   name: cluster-network-addons-operator
   namespace: kubevirt-hyperconverged
 spec:
@@ -196,13 +196,13 @@ spec:
         - name: OVS_MARKER_IMAGE
           value: quay.io/kubevirt/ovs-cni-marker:v0.7.0
         - name: KUBEMACPOOL_IMAGE
-          value: quay.io/kubevirt/kubemacpool:v0.4.0
+          value: quay.io/kubevirt/kubemacpool:v0.5.0
         - name: OPERATOR_IMAGE
-          value: quay.io/kubevirt/cluster-network-addons-operator:0.13.0
+          value: quay.io/kubevirt/cluster-network-addons-operator:0.15.0
         - name: OPERATOR_NAME
           value: cluster-network-addons-operator
         - name: OPERATOR_VERSION
-          value: 0.13.0
+          value: 0.15.0
         - name: OPERATOR_NAMESPACE
           valueFrom:
             fieldRef:
@@ -212,7 +212,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
         - name: WATCH_NAMESPACE
-        image: quay.io/kubevirt/cluster-network-addons-operator:0.13.0
+        image: quay.io/kubevirt/cluster-network-addons-operator:0.15.0
         imagePullPolicy: IfNotPresent
         name: cluster-network-addons-operator
         resources: {}

diff --git a/hack/config b/hack/config
@@ -2,7 +2,7 @@
 
 KUBEVIRT_VERSION="v0.17.0"
 CDI_VERSION="v1.6.0"
-NETWORK_ADDONS_VERSION="0.13.0"
+NETWORK_ADDONS_VERSION="0.15.0"
 SSP_VERSION="v0.1.0"
 
 CONTAINER_REGISTRY="docker.io/kubevirt"

diff --git a/hack/defaults b/hack/defaults
@@ -6,7 +6,7 @@ WAIT_TIMEOUT="${WAIT_TIMEOUT:-300s}"
 # Use upstream manifests with downstream containers
 KUBEVIRT_MANIFEST_VERSION="v0.17.0"
 CDI_MANIFEST_VERSION="v1.6.0"
-NETWORK_ADDONS_MANIFEST_VERSION="0.13.0"
+NETWORK_ADDONS_MANIFEST_VERSION="0.15.0"
 SSP_MANIFEST_VERSION="v1.0.8"
 
 CDI_CONTAINER_REGISTRY="${CDI_CONTAINER_REGISTRY:-docker.io/kubevirt}"

diff --git a/tools/manifest-templator/manifest-templator.go b/tools/manifest-templator/manifest-templator.go
@@ -318,6 +318,7 @@ func getCNA(data *templateData) {
 
 	// Get CNA Deployment
 	cnadeployment := cnacomponents.GetDeployment(
+		data.CNA.OperatorTag,
 		data.CNA.OperatorTag,
 		data.Namespace,
 		data.CnaContainerPrefix,

diff --git a/...n/check-patch.lifecycle.k8s-1.11.0.mounts → ...n/check-patch.lifecycle.k8s-1.13.3.mounts b/...n/check-patch.lifecycle.k8s-1.11.0.mounts → ...n/check-patch.lifecycle.k8s-1.13.3.mounts
diff --git a/...check-patch.lifecycle.k8s-1.11.0.packages → ...check-patch.lifecycle.k8s-1.13.3.packages b/...check-patch.lifecycle.k8s-1.11.0.packages → ...check-patch.lifecycle.k8s-1.13.3.packages
diff --git a/...ation/check-patch.lifecycle.k8s-1.11.0.sh → ...ation/check-patch.lifecycle.k8s-1.13.3.sh b/...ation/check-patch.lifecycle.k8s-1.11.0.sh → ...ation/check-patch.lifecycle.k8s-1.13.3.sh
diff --git a/...on/check-patch.workflow.k8s-1.11.0.mounts → ...on/check-patch.workflow.k8s-1.13.3.mounts b/...on/check-patch.workflow.k8s-1.11.0.mounts → ...on/check-patch.workflow.k8s-1.13.3.mounts
diff --git a/.../check-patch.workflow.k8s-1.11.0.packages → .../check-patch.workflow.k8s-1.13.3.packages b/.../check-patch.workflow.k8s-1.11.0.packages → .../check-patch.workflow.k8s-1.13.3.packages
diff --git a/...mation/check-patch.workflow.k8s-1.11.0.sh → ...mation/check-patch.workflow.k8s-1.13.3.sh b/...mation/check-patch.workflow.k8s-1.11.0.sh → ...mation/check-patch.workflow.k8s-1.13.3.sh
diff --git a/vendor/github.com/kubevirt/cluster-network-addons-operator/pkg/components/components.go b/vendor/github.com/kubevirt/cluster-network-addons-operator/pkg/components/components.go
diff --git a/...m/kubevirt/cluster-network-addons-operator/pkg/controller/statusmanager/status_manager.go b/...m/kubevirt/cluster-network-addons-operator/pkg/controller/statusmanager/status_manager.go
diff --git a/vendor/github.com/kubevirt/cluster-network-addons-operator/test/check/check.go b/vendor/github.com/kubevirt/cluster-network-addons-operator/test/check/check.go
diff --git a/vendor/github.com/kubevirt/cluster-network-addons-operator/test/releases/0.15.0.go b/vendor/github.com/kubevirt/cluster-network-addons-operator/test/releases/0.15.0.go
diff --git a/vendor/github.com/kubevirt/cluster-network-addons-operator/test/releases/0.16.0.go b/vendor/github.com/kubevirt/cluster-network-addons-operator/test/releases/0.16.0.go
diff --git a/...m/kubevirt/cluster-network-addons-operator/tools/manifest-templator/manifest-templator.go b/...m/kubevirt/cluster-network-addons-operator/tools/manifest-templator/manifest-templator.go