openstack
/
magnum
Code Issues Proposed changes

Merge "Fix coe_version for k8s driver"

This commit is contained in:
Zuul 2019-06-14 12:30:15 +00:00 committed by Gerrit Code Review
parent 3217e75b63 dc100551e4
commit b92a81ddeb
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,6 +180,11 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
extra_params['registry_container'] = (
CONF.docker_registry.swift_registry_container)
kube_tag = (cluster.labels.get("kube_tag") or
cluster_template.labels.get("kube_tag"))
if kube_tag:
extra_params['kube_version'] = kube_tag
return super(K8sTemplateDefinition,
self).get_params(context, cluster_template, cluster,
extra_params=extra_params,

1
magnum/drivers/k8s_fedora_atomic_v1/driver.py
View File

@ -86,6 +86,7 @@ class Driver(driver.HeatDriver):
# rebuild then do the k8s upgrade again, when both image id and
# kube_tag changed
heat_params["kube_tag"] = cluster_template.labels["kube_tag"]
heat_params["kube_version"] = cluster_template.labels["kube_tag"]
heat_params["master_kube_tag"] = cluster_template.labels["kube_tag"]
heat_params["minion_kube_tag"] = cluster_template.labels["kube_tag"]
heat_params["update_max_batch_size"] = max_batch_size

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

@ -604,6 +604,7 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'traefik_ingress_controller_tag': traefik_ingress_controller_tag,
'master_image': master_image,
'minion_image': minion_image,
'kube_version': kube_tag,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,
@ -1008,6 +1009,7 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'traefik_ingress_controller_tag': traefik_ingress_controller_tag,
'master_image': master_image,
'minion_image': minion_image,
'kube_version': kube_tag,
}}
mock_get_params.assert_called_once_with(mock_context,
mock_cluster_template,

7
releasenotes/notes/fix-k8s-coe-version-a8ea38f327ea6bb3.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The coe_version was out of sync with the k8s version deployed
for the cluster. Now it is fixed by making sure the kube_version is
consistent with the kube_tag when creating the cluster and upgrading
the cluster.