Merge pull request #5763 from mgugino-upstream-stage/fix-master-config-upgrade

Remove unneeded master config updates during upgrades

playbooks/common/openshift-cluster/upgrades/v3_4/master_config_upgrade.yml

@@ -1,22 +1,6 @@
 ---
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginConfig'
-    yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "'admission_plugin_config' in openshift.master"
-
-- modify_yaml:
-    dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginOrderOverride'
-    yaml_value:
-
-- modify_yaml:
-    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.serviceServingCert.signer.certFile'
     yaml_value: service-signer.crt
 

playbooks/common/openshift-cluster/upgrades/v3_5/master_config_upgrade.yml

@@ -1,22 +1,6 @@
 ---
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginConfig'
-    yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "'admission_plugin_config' in openshift.master"
-
-- modify_yaml:
-    dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginOrderOverride'
-    yaml_value:
-
-- modify_yaml:
-    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.serviceServingCert.signer.certFile'
     yaml_value: service-signer.crt
 

playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml

@@ -1,22 +1,6 @@
 ---
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginConfig'
-    yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "'admission_plugin_config' in openshift.master"
-
-- modify_yaml:
-    dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginOrderOverride'
-    yaml_value:
-
-- modify_yaml:
-    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.serviceServingCert.signer.certFile'
     yaml_value: service-signer.crt
 

playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml

@@ -1,22 +1,6 @@
 ---
 - modify_yaml:
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginConfig'
-    yaml_value: "{{ openshift.master.admission_plugin_config }}"
-  when: "'admission_plugin_config' in openshift.master"
-
-- modify_yaml:
-    dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-    yaml_key: 'admissionConfig.pluginOrderOverride'
-    yaml_value:
-
-- modify_yaml:
-    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'