Skip to content

Commit f97fd57

Browse files
committed
controller manager config: Set leaderElection.name
Set leaderElection.name in OpenShiftControllerManagerConfig to contain the custom value currently in use so that the operand deployment is backward compatible when the lease name is no longer being set in the operand executable. This is necessary for the upcoming operand refactoring.
1 parent 0ab3099 commit f97fd57

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
apiVersion: openshiftcontrolplane.config.openshift.io/v1
22
kind: OpenShiftControllerManagerConfig
3+
leaderElection:
4+
name: openshift-master-controllers

pkg/operator/sync_openshiftcontrollermanager_v311_00_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ func TestExpectedConfigMap(t *testing.T) {
6363
APIVersion: "openshiftcontrolplane.config.openshift.io/v1",
6464
Kind: "OpenShiftControllerManagerConfig",
6565
},
66+
LeaderElection: configv1.LeaderElection{
67+
Name: "openshift-master-controllers",
68+
},
6669
Controllers: []string{"*",
6770
"-openshift.io/build",
6871
"-openshift.io/build-config-change",

0 commit comments

Comments
 (0)