starlingx/config
Code Issues Proposed changes

Merge "Add upgrade path for feature-gate removal"

Browse Source
This commit is contained in:
Zuul 2022-08-22 20:25:05 +00:00 committed by Gerrit Code Review
commit 9024a2b4b5
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 = []