Bug 1986003: Bump k8s.io to 1.22.0-rc.0

go.mod

@@ -5,16 +5,16 @@ go 1.16
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/imdario/mergo v0.3.7
-	github.com/openshift/api v0.0.0-20210331193751-3acddb19d360
-	github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
-	github.com/openshift/library-go v0.0.0-20210331235027-66936e2fcc52
-	github.com/prometheus/client_golang v1.7.1
-	github.com/spf13/cobra v1.1.1
-	k8s.io/api v0.21.0-rc.0
-	k8s.io/apimachinery v0.21.0-rc.0
-	k8s.io/client-go v0.21.0-rc.0
-	k8s.io/code-generator v0.21.0-rc.0
-	k8s.io/klog/v2 v2.8.0
+	github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee
+	github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
+	github.com/openshift/library-go v0.0.0-20210730114916-d82fae7e3feb
+	github.com/prometheus/client_golang v1.11.0
+	github.com/spf13/cobra v1.1.3
+	k8s.io/api v0.22.0-rc.0
+	k8s.io/apimachinery v0.22.0-rc.0
+	k8s.io/client-go v0.22.0-rc.0
+	k8s.io/code-generator v0.22.0-rc.0
+	k8s.io/klog/v2 v2.9.0
 	sigs.k8s.io/controller-tools v0.2.8
 	sigs.k8s.io/descheduler v0.20.1-0.20210127064140-241f1325c968
 )

pkg/operator/target_config_reconciler.go

@@ -153,7 +153,7 @@ func (c *TargetConfigReconciler) manageRole(descheduler *deschedulerv1.KubeDesch
 		},
 	}
 
-	return resourceapply.ApplyRole(c.kubeClient.RbacV1(), c.eventRecorder, required)
+	return resourceapply.ApplyRole(c.ctx, c.kubeClient.RbacV1(), c.eventRecorder, required)
 }
 
 func (c *TargetConfigReconciler) manageRoleBinding(descheduler *deschedulerv1.KubeDescheduler) (*rbacv1.RoleBinding, bool, error) {
@@ -168,7 +168,7 @@ func (c *TargetConfigReconciler) manageRoleBinding(descheduler *deschedulerv1.Ku
 		},
 	}
 
-	return resourceapply.ApplyRoleBinding(c.kubeClient.RbacV1(), c.eventRecorder, required)
+	return resourceapply.ApplyRoleBinding(c.ctx, c.kubeClient.RbacV1(), c.eventRecorder, required)
 }
 
 func (c *TargetConfigReconciler) manageService(descheduler *deschedulerv1.KubeDescheduler) (*v1.Service, bool, error) {
@@ -183,11 +183,13 @@ func (c *TargetConfigReconciler) manageService(descheduler *deschedulerv1.KubeDe
 		},
 	}
 
-	return resourceapply.ApplyService(c.kubeClient.CoreV1(), c.eventRecorder, required)
+	return resourceapply.ApplyService(c.ctx, c.kubeClient.CoreV1(), c.eventRecorder, required)
 }
 
 func (c *TargetConfigReconciler) manageServiceMonitor(descheduler *deschedulerv1.KubeDescheduler) (bool, error) {
-	return resourceapply.ApplyServiceMonitor(c.dynamicClient, c.eventRecorder, bindata.MustAsset("assets/kube-descheduler/servicemonitor.yaml"))
+	required := resourceread.ReadUnstructuredOrDie(bindata.MustAsset("assets/kube-descheduler/servicemonitor.yaml"))
+	_, changed, err := resourceapply.ApplyKnownUnstructured(c.ctx, c.dynamicClient, c.eventRecorder, required)
+	return changed, err
 }
 
 func (c *TargetConfigReconciler) manageConfigMap(descheduler *deschedulerv1.KubeDescheduler) (*v1.ConfigMap, bool, error) {
@@ -245,7 +247,7 @@ func (c *TargetConfigReconciler) manageConfigMap(descheduler *deschedulerv1.Kube
 		return nil, false, err
 	}
 	required.Data = map[string]string{"policy.yaml": string(policyBytes)}
-	return resourceapply.ApplyConfigMap(c.kubeClient.CoreV1(), c.eventRecorder, required)
+	return resourceapply.ApplyConfigMap(c.ctx, c.kubeClient.CoreV1(), c.eventRecorder, required)
 }
 
 // checkProfileConflicts ensures that multiple profiles aren't redeclared
@@ -318,6 +320,7 @@ func (c *TargetConfigReconciler) manageDeployment(descheduler *deschedulerv1.Kub
 	}
 	// FIXME: this method will disappear in 4.6 so we need to fix this ASAP
 	return resourceapply.ApplyDeploymentWithForce(
+		c.ctx,
 		c.kubeClient.AppsV1(),
 		c.eventRecorder,
 		required,