summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/adhoc')
-rwxr-xr-xplaybooks/adhoc/upgrades/library/openshift_upgrade_config.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index 33eb40d7d..f9ee5b254 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -74,13 +74,9 @@ def upgrade_master_3_0_to_3_1(ansible_module, config_base, backup):
config['apiLevels'] = result['new_list']
changes.append(result['changes'])
- if 'kubernetesMasterConfig' in config:
- result = modify_api_levels(config['kubernetesMasterConfig'].get('apiLevels'),
- unsupported_levels, supported_levels, 'master-config.yaml:',
- 'from apiLevels')
- if result['changed']:
- config['kubernetesMasterConfig']['apiLevels'] = result['new_list']
- changes.append(result['changes'])
+ if 'kubernetesMasterConfig' in config and 'apiLevels' in config['kubernetesMasterConfig']:
+ config['kubernetesMasterConfig'].remove('apiLevels')
+ changes.append('master-config.yaml: removed kubernetesMasterConfig.apiLevels')
# Add proxyClientInfo to master-config
if 'proxyClientInfo' not in config['kubernetesMasterConfig']: