starlingx
/
config
Code Issues Proposed changes

sysinv: update constant name to be more accurate 

For ease of upgrades we're going to have the sysinv DB
default to the same version of K8s that is used by 21.05
and then have ansible override it for fresh installs.

Accordingly, rename the constant to more accurately reflect
how it's used.

Story: 2008972
Task: 43435
Change-Id: Iff0e9d1d942aff8cd36f69ffda9615154c45a6e7
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
This commit is contained in:
Chris Friesen 2021-09-29 17:58:57 -04:00
parent d704830e18
commit d057372701
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysinv/sysinv/sysinv/sysinv/common/kubernetes.py
View File

@ -114,8 +114,10 @@ KUBE_ROOTCA_UPDATING_HOST_TRUSTNEWCA = 'updating-host-trust-new-ca'
KUBE_ROOTCA_UPDATED_HOST_TRUSTNEWCA = 'updated-host-trust-new-ca'
KUBE_ROOTCA_UPDATING_HOST_TRUSTNEWCA_FAILED = 'updating-host-trust-new-ca-failed'
# Kubeadm and Kubelet default versions
KUBERNETES_DEFAULT_VERSION = '1.18.1'
# Kubeadm and Kubelet initial versions
# This matches the version at the time the kube_cmd_versions table
# was introduced.
K8S_INITIAL_CMD_VERSION = '1.18.1'
# Kubernetes constants
MANIFEST_APPLY_TIMEOUT = 60 * 15

4
sysinv/sysinv/sysinv/sysinv/db/sqlalchemy/migrate_repo/versions/118_kube_cmd_versions_table.py
View File

@ -21,8 +21,8 @@ CHARSET = 'utf8'
def _insert_default_kube_cmd_version(kube_cmd_versions):
kube_cmd_versions_insert = kube_cmd_versions.insert()
values = {
'kubeadm_version': kubernetes.KUBERNETES_DEFAULT_VERSION,
'kubelet_version': kubernetes.KUBERNETES_DEFAULT_VERSION
'kubeadm_version': kubernetes.K8S_INITIAL_CMD_VERSION,
'kubelet_version': kubernetes.K8S_INITIAL_CMD_VERSION
}
kube_cmd_versions_insert.execute(values)

4
sysinv/sysinv/sysinv/sysinv/tests/api/test_kube_cmd_version.py
View File

@ -28,9 +28,9 @@ class TestKubeCmdVersion(base.FunctionalTest):
headers=self.API_HEADERS)
self.assert_fields(response)
self.assertEqual(response['kubeadm_version'],
kubernetes.KUBERNETES_DEFAULT_VERSION)
kubernetes.K8S_INITIAL_CMD_VERSION)
self.assertEqual(response['kubelet_version'],
kubernetes.KUBERNETES_DEFAULT_VERSION)
kubernetes.K8S_INITIAL_CMD_VERSION)
def test_patch_kube_cmd_version_success(self):
values = {

10
sysinv/sysinv/sysinv/sysinv/tests/puppet/test_kubernetes.py
View File

@ -283,12 +283,12 @@ class KubeVersionTestCase(base.PuppetTestCaseMixin, dbbase.BaseHostTestCase):
kubeadm_version = config.get("platform::kubernetes::params::kubeadm_version")
kubelet_version = config.get("platform::kubernetes::params::kubelet_version")
self.assertEqual(kubeadm_version, kubernetes.KUBERNETES_DEFAULT_VERSION)
self.assertEqual(kubelet_version, kubernetes.KUBERNETES_DEFAULT_VERSION)
self.assertEqual(kubeadm_version, kubernetes.K8S_INITIAL_CMD_VERSION)
self.assertEqual(kubelet_version, kubernetes.K8S_INITIAL_CMD_VERSION)
def test_kubernetes_versions_in_hieradata_upgrade_started(self):
dbutils.create_test_kube_upgrade(
from_version=kubernetes.KUBERNETES_DEFAULT_VERSION,
from_version=kubernetes.K8S_INITIAL_CMD_VERSION,
to_version='v1.19.13',
state=kubernetes.KUBE_UPGRADING_FIRST_MASTER,
)
@ -304,11 +304,11 @@ class KubeVersionTestCase(base.PuppetTestCaseMixin, dbbase.BaseHostTestCase):
kubelet_version = config.get("platform::kubernetes::params::kubelet_version")
self.assertEqual(kubeadm_version, '1.19.13')
self.assertEqual(kubelet_version, kubernetes.KUBERNETES_DEFAULT_VERSION)
self.assertEqual(kubelet_version, kubernetes.K8S_INITIAL_CMD_VERSION)
def test_kubernetes_versions_in_hieradata_upgrade_kubelet(self):
dbutils.create_test_kube_upgrade(
from_version=kubernetes.KUBERNETES_DEFAULT_VERSION,
from_version=kubernetes.K8S_INITIAL_CMD_VERSION,
to_version='v1.19.13',
state=kubernetes.KUBE_UPGRADING_KUBELETS,
)