starlingx
/
config
Code Issues Proposed changes

Add upgrade path for feature-gate removal 

The commit a6a5349d02
(k8s-1.22.5: remove feature-gates)
added a script that removes deprecated feature gates which is run during
upgrade-activate phase of previous upgrade cycle .

The commit 73632416b3
(Preserve kube-apiserver manifest params during upgrade-activate)
modified the script to preserve the kube-apiserver manifest parameters
and it is supposed to run in next patch release upgrade.

This change adds a new 'from_version' for the manifest to run during
next patch release.

The previous 'from_version' is still supported as in the future, we will
need to support CentOS to Debian upgrade.

Test Plan:
On CentOS AIO-SX
PASS: Upgrade Successful. Check if advertise address in
      kube-apiserver manifest before and after running
      upgrade-activate is same.
      Ensure that the seccomp profile configuration is
      removed after upgrade-activate.
      Kube-apiserver is running and cluster is accessible after
      the upgrade.

Closes-Bug: 1986854

Signed-off-by: Kaustubh Dhokte <kaustubh.dhokte@windriver.com>
Change-Id: I0e40df6e341f2da4f0e7ed4b4803197cd07470d5
This commit is contained in:
Kaustubh Dhokte 2022-08-22 02:30:15 -04:00
parent baa8dc6670
commit 3c8a992c5f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -12011,7 +12011,7 @@ class ConductorManager(service.PeriodicService):
# Apply etcd split ca puppet manifest for standby controller.
manifests_applied = self._split_etcd_security_config(context)
if from_version == tsc.SW_VERSION_21_12:
if from_version in (tsc.SW_VERSION_21_12, tsc.SW_VERSION_22_06):
manifests_applied |= self._update_kubeadm_feature_gates(context)
if manifests_applied:

1
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

@ -15,6 +15,7 @@ from six.moves import configparser
SW_VERSION = ""
SW_VERSION_21_05 = "21.05"
SW_VERSION_21_12 = "21.12"
SW_VERSION_22_06 = "22.06"
nodetype = None
subfunctions = []