ng-13: Support nodegroup upgrade
Adds support for upgrading nodegroups. All non-default nodegroups, are allowed to be upgraded using the CT set in the cluster. The only label that gets upgraded for now is kube_tag. All other labels in the new cluster_template are ignored. Change-Id: Icade1a70f160d5ec1c0e6f06ee642e29fe9b02ffchanges/33/686733/6
Theodoros Tsioutsias
4 years ago
parent
113fdc44b2
commit
0ac4db955f
@ -0,0 +1,142 @@
|
||||
# Copyright (c) 2018 European Organization for Nuclear Research.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from mock import patch
|
||||
|
||||
from magnum.common import exception
|
||||
from magnum.drivers.k8s_fedora_atomic_v1 import driver
|
||||
from magnum.tests.unit.db import base
|
||||
from magnum.tests.unit.objects import utils as obj_utils
|
||||
|
||||
|
||||
class K8sFedoraAtomicV1DriverTest(base.DbTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(K8sFedoraAtomicV1DriverTest, self).setUp()
|
||||
self.driver = driver.Driver()
|
||||
self.cluster_template = obj_utils.create_test_cluster_template(
|
||||
self.context, uuid='94889aa4-e686-11e9-81b4-2a2ae2dbcce4',
|
||||
name='test_2', id=2, labels={'kube_tag': 'v1.14.7'},
|
||||
image_id='test-image2')
|
||||
self.cluster_obj = obj_utils.create_test_cluster(
|
||||
self.context, name='cluster_example_A', image_id='test-image1')
|
||||
self.cluster_obj.refresh()
|
||||
self.nodegroup_obj = obj_utils.create_test_nodegroup(
|
||||
self.context, name='test_ng', cluster_id=self.cluster_obj.uuid,
|
||||
uuid='27e3153e-d5bf-4b7e-b517-fb518e17f34c',
|
||||
project_id=self.cluster_obj.project_id, is_default=False,
|
||||
image_id='test-image1')
|
||||
self.nodegroup_obj.refresh()
|
||||
|
||||
@patch('magnum.common.keystone.KeystoneClientV3')
|
||||
@patch('magnum.common.clients.OpenStackClients')
|
||||
def test_upgrade_default_worker_ng(self, mock_osc, mock_keystone):
|
||||
mock_keystone.is_octavia_enabled.return_value = False
|
||||
def_ng = self.cluster_obj.default_ng_worker
|
||||
self.driver.upgrade_cluster(self.context, self.cluster_obj,
|
||||
self.cluster_template, 1, def_ng)
|
||||
# make sure that the kube_tag is reflected correctly to the cluster
|
||||
# and the default nodegroups.
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
self.cluster_obj.labels['kube_tag'])
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
self.cluster_obj.default_ng_master.labels['kube_tag'])
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
def_ng.labels['kube_tag'])
|
||||
# make sure that the image from the cluster
|
||||
# template is NOT set to the default nodegroups.
|
||||
self.assertEqual('test-image1',
|
||||
self.cluster_obj.default_ng_master.image_id)
|
||||
self.assertEqual('test-image1', def_ng.image_id)
|
||||
# check that the non-default nodegroup was not changed
|
||||
self.assertNotIn('kube_tag', self.nodegroup_obj.labels)
|
||||
self.assertEqual('test-image1', self.nodegroup_obj.image_id)
|
||||
|
||||
@patch('magnum.common.keystone.KeystoneClientV3')
|
||||
@patch('magnum.common.clients.OpenStackClients')
|
||||
def test_upgrade_default_master_ng(self, mock_osc, mock_keystone):
|
||||
mock_keystone.is_octavia_enabled.return_value = False
|
||||
def_ng = self.cluster_obj.default_ng_master
|
||||
self.driver.upgrade_cluster(self.context, self.cluster_obj,
|
||||
self.cluster_template, 1, def_ng)
|
||||
# make sure that the kube_tag is reflected correctly to the cluster
|
||||
# and the default nodegroups.
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
self.cluster_obj.labels['kube_tag'])
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
self.cluster_obj.default_ng_worker.labels['kube_tag'])
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
def_ng.labels['kube_tag'])
|
||||
# make sure that the image from the cluster
|
||||
# template is NOT set to the default nodegroups.
|
||||
self.assertEqual('test-image1',
|
||||
self.cluster_obj.default_ng_worker.image_id)
|
||||
self.assertEqual('test-image1', def_ng.image_id)
|
||||
# check that the non-default nodegroup was not changed
|
||||
self.assertNotIn('kube_tag', self.nodegroup_obj.labels)
|
||||
self.assertEqual('test-image1', self.nodegroup_obj.image_id)
|
||||
|
||||
@patch('magnum.common.keystone.KeystoneClientV3')
|
||||
@patch('magnum.common.clients.OpenStackClients')
|
||||
def test_upgrade_non_default_ng(self, mock_osc, mock_keystone):
|
||||
mock_keystone.is_octavia_enabled.return_value = False
|
||||
self.driver.upgrade_cluster(self.context, self.cluster_obj,
|
||||
self.cluster_template, 1,
|
||||
self.nodegroup_obj)
|
||||
# check that the cluster and default nodegroups were not changed
|
||||
self.assertNotIn('kube_tag', self.cluster_obj.labels)
|
||||
self.assertNotIn('kube_tag', self.cluster_obj.default_ng_master.labels)
|
||||
self.assertNotIn('kube_tag', self.cluster_obj.default_ng_worker.labels)
|
||||
# make sure that the image from the cluster template
|
||||
# is not reflected to the default nodegroups.
|
||||
self.assertEqual('test-image1',
|
||||
self.cluster_obj.default_ng_master.image_id)
|
||||
self.assertEqual('test-image1',
|
||||
self.cluster_obj.default_ng_worker.image_id)
|
||||
# check that the non-default nodegroup reflects the cluster template.
|
||||
self.assertEqual(self.cluster_template.labels['kube_tag'],
|
||||
self.nodegroup_obj.labels['kube_tag'])
|
||||
self.assertEqual('test-image1',
|
||||
self.nodegroup_obj.image_id)
|
||||
|
||||
@patch('magnum.common.keystone.KeystoneClientV3')
|
||||
@patch('magnum.common.clients.OpenStackClients')
|
||||
def test_downgrade_not_supported(self, mock_osc, mock_keystone):
|
||||
# Scenario, a user creates a nodegroup with kube_tag
|
||||
# greater that the one set in cluster's template. Check
|
||||
# that downgrading is not supported.
|
||||
self.nodegroup_obj.labels = {'kube_tag': 'v1.14.7'}
|
||||
self.nodegroup_obj.save()
|
||||
self.cluster_template.labels = {'kube_tag': 'v1.14.3'}
|
||||
self.cluster_template.save()
|
||||
mock_keystone.is_octavia_enabled.return_value = False
|
||||
self.assertRaises(exception.InvalidVersion,
|
||||
self.driver.upgrade_cluster, self.context,
|
||||
self.cluster_obj, self.cluster_template, 1,
|
||||
self.nodegroup_obj)
|
||||
|
||||
@patch('magnum.common.keystone.KeystoneClientV3')
|
||||
@patch('magnum.common.clients.OpenStackClients')
|
||||
def test_invalid_ct(self, mock_osc, mock_keystone):
|
||||
# Scenario, a user creates a nodegroup with kube_tag
|
||||
# greater that the one set in cluster's template. Check
|
||||
# that downgrading is not supported.
|
||||
self.cluster_template.labels = {}
|
||||
self.cluster_template.save()
|
||||
mock_keystone.is_octavia_enabled.return_value = False
|
||||
self.assertRaises(exception.InvalidClusterTemplateForUpgrade,
|
||||
self.driver.upgrade_cluster, self.context,
|
||||
self.cluster_obj, self.cluster_template, 1,
|
||||
self.nodegroup_obj)
|
||||
@ -0,0 +1,12 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Cluster upgrade API supports upgrading specific nodegroups
|
||||
in kubernetes clusters. If a user chooses a default nodegroup to
|
||||
be upgraded, then both of the default nodegroups will be upgraded
|
||||
since they are in one stack. For non-default nodegroups users are
|
||||
allowed to use only the cluster template already set in the
|
||||
cluster. This means that the cluster (default nodegroups) has to
|
||||
be upgraded on the first hand. For now, the only label that is
|
||||
taken into consideration during upgrades is the kube_tag. All
|
||||
other labels are ignored.
|
||||
Loading…
Reference in New Issue