openstack
/
magnum
Code Issues Proposed changes

[fedora-atomic] kube_tag is not respcted 

This is a regression issue introduced by the rolling upgrade feature,
without setting the master_kube_tag and minion_kube_tag, they will
be set with the default value. This patch fixes it by keeping them
consistent with the kube_tag label.

Change-Id: I8b0ca3f87c9a52d48ecb75e4dd8de18a61a10d6f
This commit is contained in:
Feilong Wang 2019-07-02 14:47:21 +12:00
parent 2ed6fa35d0
commit a4d34490c3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/drivers/heat/k8s_template_def.py
View File

@ -183,6 +183,8 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
cluster_template.labels.get("kube_tag"))
if kube_tag:
extra_params['kube_version'] = kube_tag
extra_params['master_kube_tag'] = kube_tag
extra_params['minion_kube_tag'] = kube_tag
return super(K8sTemplateDefinition,
self).get_params(context, cluster_template, cluster,

4
magnum/tests/unit/drivers/test_template_definition.py
View File

@ -608,6 +608,8 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'master_image': master_image,
'minion_image': minion_image,
'kube_version': kube_tag,
'master_kube_tag': kube_tag,
'minion_kube_tag': kube_tag,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,
@ -1016,6 +1018,8 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'master_image': master_image,
'minion_image': minion_image,
'kube_version': kube_tag,
'master_kube_tag': kube_tag,
'minion_kube_tag': kube_tag,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,