diff --git a/Gopkg.lock b/Gopkg.lock index 7cc77bb60c..9a9a61b649 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1066,7 +1066,7 @@ revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803" [[projects]] - digest = "1:945d532b66e225a81808e5743b03ff5be0eb5848f88c54521970c4aa7771cc98" + digest = "1:25b0ee8b649475c39489c4c71d58fcd97c5b77d42fa808bf1037b8cdf54f061a" name = "kubevirt.io/containerized-data-importer" packages = [ ".", @@ -1096,7 +1096,7 @@ version = "v1.9.3" [[projects]] - digest = "1:022e674c513c6f84d0b89fefb64b3703407474e70f97e3bc5ecabf6bc9ebcd92" + digest = "1:cb8efaf39495f42fa183e949ebb4daaa053b22b14572c97611b0855ca77b6bab" name = "kubevirt.io/kubevirt" packages = [ ".", @@ -1125,8 +1125,8 @@ "pkg/virt-operator/util", ] pruneopts = "NT" - revision = "cd41be9b3eff3148e7265fa21847cca0091b1f77" - version = "v0.17.3" + revision = "adfdb8c07830b99fc79d2fd1d004e862ef70979e" + version = "v0.17.4" [[projects]] digest = "1:06035489efbd51ccface65fc878ceeb849aba05b2f9443c8993f363fc96e80ac" diff --git a/Gopkg.toml b/Gopkg.toml index 05ee5ac6f3..ff0c3315f8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -19,7 +19,7 @@ required = [ [[override]] name = "kubevirt.io/kubevirt" - version = "=v0.17.3" + version = "=v0.17.4" [[override]] name = "github.com/go-kit/kit" diff --git a/deploy/converged/cluster_role.yaml b/deploy/converged/cluster_role.yaml index 28491168cd..a3880f2e0b 100644 --- a/deploy/converged/cluster_role.yaml +++ b/deploy/converged/cluster_role.yaml @@ -771,7 +771,6 @@ metadata: name: kubevirt-ssp-operator rules: - apiGroups: - - kubevirt.io - oauth.openshift.io - template.openshift.io resources: @@ -785,10 +784,8 @@ rules: verbs: - create - get - - list - - watch - patch - - update + - list - apiGroups: - rbac.authorization.k8s.io resources: @@ -799,57 +796,53 @@ rules: - list - watch - patch - - update - apiGroups: - extensions - apps resources: - deployments - replicasets - - daemonsets - - statefulsets verbs: - - '*' + - create + - get + - patch + - list - apiGroups: - - "" + - apps resources: - - serviceaccounts - - configmaps - - nodes - - endpoints - - events - - secrets + - daemonsets verbs: - create - get - patch - - update - - list - - watch - apiGroups: - "" resources: - - pods + - serviceaccounts verbs: - - '*' + - create + - get + - patch - apiGroups: - "" resources: - - services + - pods + - configmaps + - nodes verbs: - create - get - - list - patch - - watch + - update - apiGroups: - "" resources: - - namespaces + - services verbs: - - get - list - - watch + - get + - create + - patch - apiGroups: - admissionregistration.k8s.io resources: diff --git a/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/drain/disruptionbudget/disruptionbudget.go b/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/drain/disruptionbudget/disruptionbudget.go index 40f39a08c1..b74087fc58 100644 --- a/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/drain/disruptionbudget/disruptionbudget.go +++ b/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/drain/disruptionbudget/disruptionbudget.go @@ -235,15 +235,14 @@ func (c *DisruptionBudgetController) resolveControllerRef(namespace string, cont if controllerRef == nil || controllerRef.Kind != virtv1.VirtualMachineInstanceGroupVersionKind.Kind { return nil } - vmi, exists, err := c.vmiInformer.GetStore().GetByKey(namespace + "/" + controllerRef.Name) - if err != nil { - return nil - } - if !exists { - return nil - } - return vmi.(*virtv1.VirtualMachineInstance) + return &virtv1.VirtualMachineInstance{ + ObjectMeta: v1.ObjectMeta{ + Name: controllerRef.Name, + Namespace: namespace, + UID: controllerRef.UID, + }, + } } // Run runs the passed in NodeController. @@ -339,7 +338,7 @@ func (c *DisruptionBudgetController) sync(key string, vmi *virtv1.VirtualMachine } else if !wantsToMigrate && pdb != nil { // We don't want migrations on evictions, if there is a pdb, remove it delete = true - } else if wantsToMigrate && pdb == nil { + } else if wantsToMigrate && vmi.DeletionTimestamp == nil && pdb == nil { // No pdb and we want migrations on evictions create = true } else if wantsToMigrate && pdb != nil { diff --git a/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/vm.go b/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/vm.go index e5950dbcc1..0f78392832 100644 --- a/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/vm.go +++ b/vendor/kubevirt.io/kubevirt/pkg/virt-controller/watch/vm.go @@ -754,7 +754,8 @@ func (c *VMController) addVirtualMachine(obj interface{}) { log.Log.Object(vmi).V(4).Info("Looking for VirtualMachineInstance Ref") vm := c.resolveControllerRef(vmi.Namespace, controllerRef) if vm == nil { - log.Log.Object(vmi).Errorf("Cant find the matching VM for VirtualMachineInstance: %s", vmi.Name) + // not managed by us + log.Log.Object(vmi).V(4).Infof("Cant find the matching VM for VirtualMachineInstance: %s", vmi.Name) return } vmKey, err := controller.KeyFunc(vm)