post-rebase: new leader election lease

Author: dmage

manifests/02-rbac.yaml

@@ -124,6 +124,12 @@ rules:
   - jobs
   verbs:
   - "*"
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - "*"
 - apiGroups:
   - policy
   resources:

test/framework/clientset.go

@@ -7,6 +7,7 @@ import (
 	clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
 	clientbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
 	clientbatchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
+	clientcoordinationv1 "k8s.io/client-go/kubernetes/typed/coordination/v1"
 	clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	clientstoragev1 "k8s.io/client-go/kubernetes/typed/storage/v1"
 	restclient "k8s.io/client-go/rest"
@@ -30,6 +31,7 @@ type Clientset struct {
 	clientstoragev1.StorageV1Interface
 	clientbatchv1beta1.BatchV1beta1Interface
 	clientbatchv1.BatchV1Interface
+	clientcoordinationv1.CoordinationV1Interface
 	ImageInterface imagev1.ImageV1Interface
 	BuildInterface buildv1.BuildV1Interface
 }
@@ -77,6 +79,10 @@ func NewClientset(kubeconfig *restclient.Config) (clientset *Clientset, err erro
 	if err != nil {
 		return
 	}
+	clientset.CoordinationV1Interface, err = clientcoordinationv1.NewForConfig(kubeconfig)
+	if err != nil {
+		return
+	}
 	clientset.BuildInterface, err = buildv1.NewForConfig(kubeconfig)
 	if err != nil {
 		return

test/framework/imageregistry.go

@@ -215,16 +215,16 @@ func deleteImageRegistryConfig(te TestEnv) {
 	}
 }
 
-func deleteLeaderElectionConfigMap(te TestEnv, name string) {
-	err := te.Client().ConfigMaps(OperatorDeploymentNamespace).Delete(
+func deleteLeaderElectionLease(te TestEnv, name string) {
+	err := te.Client().Leases(OperatorDeploymentNamespace).Delete(
 		context.Background(),
 		name,
 		metav1.DeleteOptions{},
 	)
 	if err == nil {
-		te.Logf("leader election configmap %s deleted", name)
+		te.Logf("leader election lease %s deleted", name)
 	} else if !errors.IsNotFound(err) {
-		te.Errorf("unable to delete leader election configmap %s: %s", name, err)
+		te.Errorf("unable to delete leader election lease %s: %s", name, err)
 	}
 }
 
@@ -290,7 +290,7 @@ func deleteImageRegistryAlwaysPresentResources(te TestEnv) {
 	te.Logf("deleting always-present resources...")
 	defer deleteImageRegistryCertificates(te)
 	defer deleteNodeCADaemonSet(te)
-	defer deleteLeaderElectionConfigMap(te, "openshift-master-controllers")
+	defer deleteLeaderElectionLease(te, "openshift-master-controllers")
 }
 
 func RemoveImageRegistry(te TestEnv) {