Merge pull request #22771 from bparees/leader

switch leader election lock for ocm to openshift-controller-manager

Author: openshift-merge-robot

hack/local-up-master/openshift-apiserver-manifests/04-namespace.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-controller-manager
+spec:
+  finalizers:
+  - kubernetes

pkg/cmd/openshift-controller-manager/controller_manager.go

@@ -83,7 +83,7 @@ func RunOpenShiftControllerManager(config *openshiftcontrolplanev1.OpenShiftCont
 	}
 	rl, err := resourcelock.New(
 		"configmaps",
-		"kube-system",
+		"openshift-controller-manager",
 		"openshift-master-controllers", // this matches what ansible used to set
 		kubeClient.CoreV1(),
 		resourcelock.ResourceLockConfig{

test/integration/project_test.go

@@ -210,13 +210,13 @@ func TestProjectWatchWithSelectionPredicate(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	// we are only watching ns-01, we should not receive events for other projects
-	waitForNoEvent(w, t)
+	waitForNoEvent(w, "ns-01", t)
 
 	if err := bobProjectClient.Projects().Delete("ns-03", nil); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	// we are only watching ns-01, we should not receive events for other projects
-	waitForNoEvent(w, t)
+	waitForNoEvent(w, "ns-01", t)
 
 	// test the "start from beginning watch"
 	beginningWatch, err := bobProjectClient.Projects().Watch(metav1.ListOptions{
@@ -236,14 +236,30 @@ func TestProjectWatchWithSelectionPredicate(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	// since we are only watching for events from "ns-01", and no projects are being modified, we should not receive any events here
-	waitForNoEvent(fromNowWatch, t)
+	waitForNoEvent(fromNowWatch, "ns-01", t)
 }
 
-func waitForNoEvent(w watch.Interface, t *testing.T) {
-	select {
-	case event := <-w.ResultChan():
-		t.Fatalf("unexpected event %v with object %#v", event, event.Object)
-	case <-time.After(3 * time.Second):
+// waitForNoEvent ensures no stray events come in.  skipProject allows modify events only for the named project
+func waitForNoEvent(w watch.Interface, skipProject string, t *testing.T) {
+	for {
+		select {
+		case event := <-w.ResultChan():
+			if event.Type != watch.Modified {
+				t.Fatalf("unexpected event %v with object %#v", event, event.Object)
+			}
+			project, ok := event.Object.(*projectapi.Project)
+			if !ok {
+				t.Fatalf("unexpected event %v with object %#v", event, event.Object)
+			}
+			t.Logf("got %#v %#v", event, project)
+			if project.Name != skipProject {
+				t.Fatalf("unexpected event %v with object %#v", event, event.Object)
+			}
+
+			continue
+		case <-time.After(3 * time.Second):
+			return
+		}
 	}
 }
 
@@ -277,6 +293,7 @@ func waitForAdd(projectName string, w watch.Interface, t *testing.T) {
 		}
 	}
 }
+
 func waitForOnlyAdd(projectName string, w watch.Interface, t *testing.T) {
 	for {
 		select {

test/util/server/server.go

@@ -379,6 +379,13 @@ func StartConfiguredMasterWithOptions(masterConfig *configapi.MasterConfig, stop
 		return "", fmt.Errorf("Waiting for roles failed with: %v", err)
 	}
 
+	// the openshift controller manager creates its lease object in this
+	// namespace, so we have to ensure it exists.
+	kubeClient, err := kubernetes.NewForConfig(clientConfig)
+	ns := &corev1.Namespace{}
+	ns.Name = "openshift-controller-manager"
+	kubeClient.CoreV1().Namespaces().Create(ns)
+
 	return adminKubeConfigFile, nil
 }