Update MRO version (#271)

kubevirt · Sep 3, 2019 · 7613f80 · 7613f80
1 parent 7daf4df
commit 7613f80
Show file tree

Hide file tree

Showing 17 changed files with 228 additions and 57 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -60,7 +60,7 @@ required = [
 
 [[override]]
   name = "kubevirt.io/machine-remediation-operator"
-  version = "=v0.3.7"
+  version = "=v0.3.10"
 
 [[override]]
   name = "k8s.io/api"

diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml
@@ -841,7 +841,7 @@ kind: ClusterRole
 metadata:
   labels:
     machineremediation.kubevirt.io: ""
-    machineremediation.kubevirt.io/version: v0.3.7
+    machineremediation.kubevirt.io/version: v0.3.10
   name: machine-remediation-operator
 rules:
 - apiGroups:
@@ -854,6 +854,14 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/cluster_role_binding.yaml b/deploy/cluster_role_binding.yaml
@@ -123,7 +123,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     machineremediation.kubevirt.io: ""
-    machineremediation.kubevirt.io/version: v0.3.7
+    machineremediation.kubevirt.io/version: v0.3.10
   name: machine-remediation-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

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-02 19:50:03.604263223 +0200 CEST m=+0.021864303
+    createdAt: 2019-09-03 15:43:27.61039013 +0300 IDT m=+0.025400476
     description: Creates and maintains a HyperConverged KubeVirt Deployment
     repository: https://github.com/kubevirt/hyperconverged-cluster-operator
     support: 'false'
@@ -1065,6 +1065,14 @@ spec:
               - list
               - update
               - watch
+            - apiGroups:
+              - ""
+              resources:
+              - nodes
+              verbs:
+              - get
+              - list
+              - watch
             - apiGroups:
               - ""
               resources:
@@ -1474,25 +1482,27 @@ spec:
             selector:
               matchLabels:
                 machineremediation.kubevirt.io: machine-remediation-operator
-                machineremediation.kubevirt.io/version: v0.3.7
+                machineremediation.kubevirt.io/version: v0.3.10
             strategy:
               type: RollingUpdate
             template:
               metadata:
                 labels:
                   machineremediation.kubevirt.io: machine-remediation-operator
-                  machineremediation.kubevirt.io/version: v0.3.7
+                  machineremediation.kubevirt.io/version: v0.3.10
               spec:
                 affinity:
                   podAntiAffinity:
-                    requiredDuringSchedulingIgnoredDuringExecution:
-                    - labelSelector:
-                        matchExpressions:
-                        - key: machineremediation.kubevirt.io
-                          operator: In
-                          values:
-                          - machine-remediation-operator
-                      topologyKey: kubernetes.io/hostname
+                    preferredDuringSchedulingIgnoredDuringExecution:
+                    - podAffinityTerm:
+                        labelSelector:
+                          matchExpressions:
+                          - key: machineremediation.kubevirt.io
+                            operator: In
+                            values:
+                            - machine-remediation-operator
+                        topologyKey: kubernetes.io/hostname
+                      weight: 50
                 containers:
                 - args:
                   - --logtostderr=true
@@ -1502,8 +1512,8 @@ spec:
                   - /usr/bin/machine-remediation-operator
                   env:
                   - name: OPERATOR_VERSION
-                    value: v0.3.7
-                  image: kubevirt/machine-remediation-operator:v0.3.7
+                    value: v0.3.10
+                  image: kubevirt/machine-remediation-operator:v0.3.10
                   imagePullPolicy: IfNotPresent
                   name: machine-remediation-operator
                   resources:

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -231,26 +231,28 @@ spec:
   selector:
     matchLabels:
       machineremediation.kubevirt.io: machine-remediation-operator
-      machineremediation.kubevirt.io/version: v0.3.7
+      machineremediation.kubevirt.io/version: v0.3.10
   strategy:
     type: RollingUpdate
   template:
     metadata:
       creationTimestamp: null
       labels:
         machineremediation.kubevirt.io: machine-remediation-operator
-        machineremediation.kubevirt.io/version: v0.3.7
+        machineremediation.kubevirt.io/version: v0.3.10
     spec:
       affinity:
         podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: machineremediation.kubevirt.io
-                operator: In
-                values:
-                - machine-remediation-operator
-            topologyKey: kubernetes.io/hostname
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: machineremediation.kubevirt.io
+                  operator: In
+                  values:
+                  - machine-remediation-operator
+              topologyKey: kubernetes.io/hostname
+            weight: 50
       containers:
       - args:
         - --logtostderr=true
@@ -260,8 +262,8 @@ spec:
         - /usr/bin/machine-remediation-operator
         env:
         - name: OPERATOR_VERSION
-          value: v0.3.7
-        image: kubevirt/machine-remediation-operator:v0.3.7
+          value: v0.3.10
+        image: kubevirt/machine-remediation-operator:v0.3.10
         imagePullPolicy: IfNotPresent
         name: machine-remediation-operator
         resources:

diff --git a/deploy/service_account.yaml b/deploy/service_account.yaml
@@ -53,6 +53,6 @@ kind: ServiceAccount
 metadata:
   labels:
     machineremediation.kubevirt.io: ""
-    machineremediation.kubevirt.io/version: v0.3.7
+    machineremediation.kubevirt.io/version: v0.3.10
   name: machine-remediation-operator
   namespace: kubevirt-hyperconverged
diff --git a/hack/deploy.sh b/hack/deploy.sh
@@ -104,11 +104,10 @@ for dep in cdi-apiserver cdi-deployment cdi-uploadproxy virt-api virt-controller
     "${CMD}" wait deployment/"${dep}" --for=condition=Available --timeout="360s" || CONTAINER_ERRORED+="${dep} "
 done
 
-# TODO: When MRO conditions stabilize, uncomment.  Create a follow up PR after this merges to uncomment
 # Wait for machine-remediation controllers under the openshift-machine-api namespace
-# for dep in machine-health-check machine-disruption-budget machine-remediation; do
-#     "${CMD}" -n openshift-machine-api wait deployment/"${dep}" --for=condition=Available --timeout="360s" || CONTAINER_ERRORED+="${dep} "
-# done
+for dep in machine-health-check machine-disruption-budget machine-remediation; do
+    "${CMD}" -n openshift-machine-api wait deployment/"${dep}" --for=condition=Available --timeout="360s" || CONTAINER_ERRORED+="${dep} "
+done
 
 if [ -z "$CONTAINER_ERRORED" ]; then
     echo "SUCCESS"

diff --git a/vendor/kubevirt.io/machine-remediation-operator/cmd/machine-remediation-operator/main.go b/vendor/kubevirt.io/machine-remediation-operator/cmd/machine-remediation-operator/main.go
diff --git a/vendor/kubevirt.io/machine-remediation-operator/doc.go b/vendor/kubevirt.io/machine-remediation-operator/doc.go
diff --git a/vendor/kubevirt.io/machine-remediation-operator/pkg/consts/consts.go b/vendor/kubevirt.io/machine-remediation-operator/pkg/consts/consts.go
diff --git a/...-remediation-operator/pkg/controllers/machinehealthcheck/machinehealthcheck_controller.go b/...-remediation-operator/pkg/controllers/machinehealthcheck/machinehealthcheck_controller.go