Remove sysinv kube-apiserver upgrade params apply
This can be dropped now that a different fix is submitted on the restore ansible playbooks. The new fix was initially proposed for platform restore but also fixes the upgrade scenario. Test Plan: In an AIO-SX, apply oidc-auth kube-apiserver parameters, perform an upgrade operation and verify these are properly restored and applied. PASS: Verify kube-apiserver service parameters are restored after a System Upgrade Closes-Bug: 1948140 Depends-On: https://review.opendev.org/c/starlingx/ansible-playbooks/+/818136 Signed-off-by: Rafael Camargos <RafaelLucas.Camargos@windriver.com> Change-Id: I1908e739046d5b215e0f081836fecdfbf8e3a700
This commit is contained in:
parent
0f4ab02514
commit
67ec634c28
|
@ -1205,28 +1205,6 @@ class ConductorManager(service.PeriodicService):
|
|||
raise exception.SysinvException(_(
|
||||
"Failed to create pxelinux.cfg file"))
|
||||
|
||||
def _apply_kube_apiserver_parameters(self, context):
|
||||
"""Applies the runtime manifest to change kube_apiserver parameters.
|
||||
Only done on simplex because the issue is due to the apiserver
|
||||
service parameters not being applied during the restore.
|
||||
returns True if runtime manifests were applied
|
||||
"""
|
||||
if cutils.is_aio_simplex_system(self.dbapi):
|
||||
personalities = [constants.CONTROLLER]
|
||||
config_uuid = self._config_update_hosts(
|
||||
context, personalities)
|
||||
config_dict = {
|
||||
"personalities": personalities,
|
||||
"classes": ['platform::kubernetes::master::change_apiserver_parameters'],
|
||||
puppet_common.REPORT_STATUS_CFG:
|
||||
puppet_common.REPORT_UPGRADE_ACTIONS
|
||||
}
|
||||
self._config_apply_runtime_manifest(context,
|
||||
config_uuid=config_uuid,
|
||||
config_dict=config_dict)
|
||||
return True
|
||||
return False
|
||||
|
||||
def _remove_pxe_config(self, host):
|
||||
"""Delete the PXE config file for this host.
|
||||
|
||||
|
@ -11362,9 +11340,6 @@ class ConductorManager(service.PeriodicService):
|
|||
# Make sure to remove v1 from address format after upgrade
|
||||
manifests_applied |= self._update_upgraded_ceph_monitors(context)
|
||||
|
||||
manifests_applied = manifests_applied or\
|
||||
self._apply_kube_apiserver_parameters(context)
|
||||
|
||||
if manifests_applied:
|
||||
LOG.info("Running upgrade activation manifests")
|
||||
self.dbapi.software_upgrade_update(
|
||||
|
|
Loading…
Reference in New Issue