diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-07 08:16:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 08:16:43 -0700 |
| commit | cb1d90e36131f05035adc7ec5a0d280fd2126fcc (patch) | |
| tree | 8232853798fe5d9f8503ecbd0ab2b6375698ac5b | |
| parent | 88191454aff1542c9b094b2dda06445d77217022 (diff) | |
| parent | 2967d963d5185d7e77fe9b235886deaf64534a3c (diff) | |
| download | openshift-cb1d90e36131f05035adc7ec5a0d280fd2126fcc.tar.gz openshift-cb1d90e36131f05035adc7ec5a0d280fd2126fcc.tar.bz2 openshift-cb1d90e36131f05035adc7ec5a0d280fd2126fcc.tar.xz openshift-cb1d90e36131f05035adc7ec5a0d280fd2126fcc.zip | |
Merge pull request #5684 from enj/enj/i/configmap_lock
Automatic merge from submit-queue.
Switch to configmap leader election on 3.7 upgrade
This change sets the controllerConfig.election.lockName to openshift-master-controllers on a 3.7 upgrade.
This is the default in a new 3.7 cluster. Important excerpt from the docs inside the origin codebase (slightly modified):
There are two modes for lease operation - a legacy mode that directly connects to etcd, and the preferred mode which coordinates on a configmap or endpoint in the kube-system namespace. Because legacy mode and the new mode do not coordinate on the same key, an upgrade must stop all controllers before changing the configuration and starting controllers with the new config.
Signed-off-by: Monis Khan <mkhan@redhat.com>
/assign @smarterclayton @jupierce
/kind bug
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml index ed89dbe8d..df59a8782 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml @@ -14,3 +14,8 @@ dest: "{{ openshift.common.config_base}}/master/master-config.yaml" yaml_key: 'kubernetesMasterConfig.admissionConfig' yaml_value: + +- modify_yaml: + dest: "{{ openshift.common.config_base}}/master/master-config.yaml" + yaml_key: 'controllerConfig.election.lockName' + yaml_value: 'openshift-master-controllers' |