Bug 1855640: Rebase to kube-0.19.0-rc.3

go.mod

@@ -3,24 +3,29 @@ module github.com/openshift/cluster-openshift-controller-manager-operator
 go 1.13
 
 require (
+	github.com/coreos/go-etcd v2.0.0+incompatible // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
+	github.com/cpuguy83/go-md2man v1.0.10 // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-bindata/go-bindata v3.1.1+incompatible
+	github.com/go-bindata/go-bindata v3.1.2+incompatible
+	github.com/gophercloud/gophercloud v0.1.0 // indirect
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
-	github.com/openshift/api v0.0.0-20200625192535-213ae491f5ec
-	github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc
-	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/openshift/library-go v0.0.0-20200407164846-05357b77e21e
-	github.com/prometheus/client_golang v1.1.0
-	github.com/spf13/cobra v0.0.5
+	github.com/openshift/api v0.0.0-20200723134351-89de68875e7c
+	github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
+	github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15
+	github.com/openshift/library-go v0.0.0-20200731134909-dbf343342338
+	github.com/prometheus/client_golang v1.7.1
+	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
+	github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
 	go.uber.org/zap v1.11.0 // indirect
-	k8s.io/api v0.18.3
-	k8s.io/apimachinery v0.18.3
-	k8s.io/client-go v0.18.0
-	k8s.io/component-base v0.18.0
+	k8s.io/api v0.19.0-rc.3
+	k8s.io/apimachinery v0.19.0-rc.3
+	k8s.io/apiserver v0.19.0-rc.3 // indirect
+	k8s.io/client-go v0.19.0-rc.3
+	k8s.io/component-base v0.19.0-rc.3
 	k8s.io/klog v1.0.0
 )

pkg/operator/generic_client.go

@@ -38,6 +38,14 @@ func (p *genericClient) GetOperatorState() (*operatorapiv1.OperatorSpec, *operat
 	return &instance.Spec.OperatorSpec, &instance.Status.OperatorStatus, instance.ResourceVersion, nil
 }
 
+func (p *genericClient) GetObjectMeta() (*metav1.ObjectMeta, error) {
+	resource, err := p.informers.Operator().V1().OpenShiftControllerManagers().Lister().Get("cluster")
+	if err != nil {
+		return nil, err
+	}
+	return &resource.ObjectMeta, nil
+}
+
 func (p *genericClient) UpdateOperatorSpec(resourceVersion string, spec *operatorapiv1.OperatorSpec) (*operatorapiv1.OperatorSpec, string, error) {
 	resource, err := p.informers.Operator().V1().OpenShiftControllerManagers().Lister().Get("cluster")
 	if err != nil {

pkg/operator/sync_openshiftcontrollermanager_v311_00.go

@@ -382,5 +382,5 @@ func manageOpenShiftControllerManagerDeployment_v311_00_to_latest(client appscli
 		}
 	}
 
-	return resourceapply.ApplyDaemonSet(client, recorder, required, resourcemerge.ExpectedDaemonSetGeneration(required, generationStatus), forceRollout)
+	return resourceapply.ApplyDaemonSetWithForce(client, recorder, required, resourcemerge.ExpectedDaemonSetGeneration(required, generationStatus), forceRollout)
 }