starlingx
/
config
Code Issues Proposed changes

Merge "Make minimum Kubernetes version field mandatory"

This commit is contained in:
Zuul 2024-04-11 13:58:16 +00:00 committed by Gerrit Code Review
parent 7299fa6118 3773c65f61
commit 82c95f934e
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sysinv/sysinv/sysinv/sysinv/common/app_metadata.py
View File

@ -22,7 +22,6 @@ from oslo_log import log as logging
from sysinv._i18n import _ from sysinv._i18n import _
from sysinv.common import constants from sysinv.common import constants
from sysinv.common import exception from sysinv.common import exception
from sysinv.common import kubernetes
from sysinv.common import utils from sysinv.common import utils
CONF = cfg.CONF CONF = cfg.CONF
@ -261,16 +260,13 @@ def validate_metadata_file(path, metadata_file, upgrade_from_release=None):
validate_dict_field(parent, validate_dict_field(parent,
constants.APP_METADATA_SUPPORTED_K8S_VERSION) constants.APP_METADATA_SUPPORTED_K8S_VERSION)
# TODO: uncomment when supported_k8s_version is included on if value is None:
# the metadata file of at least all default apps raise exception.SysinvException(_(
# "Kubernetes supported versions not specified on application "
# if value is None: "metadata file. Please add a 'supported_k8s_version' section "
# raise exception.SysinvException(_( "containing at least a 'minimum' field ('maximum' field is "
# "Kubernetes supported versions not specified on application " "optional)."))
# "metadata file. Please add a 'supported_k8s_version' section "
# "containing at least a 'minimum' field ('maximum' field is "
# "optional)."))
#
return value return value
def validate_k8s_minimum_version(parent): def validate_k8s_minimum_version(parent):
@ -282,15 +278,12 @@ def validate_metadata_file(path, metadata_file, upgrade_from_release=None):
""" """
validate_string_field(parent, constants.APP_METADATA_MINIMUM) validate_string_field(parent, constants.APP_METADATA_MINIMUM)
# TODO: uncomment when k8s_minimum_version is included on value = validate_string_field(parent, constants.APP_METADATA_MINIMUM)
# the metadata file of at least all default apps if value is None:
# raise exception.SysinvException(_(
# value = validate_string_field(parent, constants.APP_METADATA_MINIMUM) "Minimum supported Kubernetes version not specified "
# if value is None: "on application metadata file. Please add a 'minimum' "
# raise exception.SysinvException(_( "field to the 'supported_k8s_version' section."))
# "Minimum supported Kubernetes version not specified "
# "on application metadata file. Please add a 'minimum' "
# "field to the 'supported_k8s_version' section."))
def validate_k8s_upgrades_section(k8s_upgrades_auto_update, def validate_k8s_upgrades_section(k8s_upgrades_auto_update,
k8s_upgrades_timing): k8s_upgrades_timing):
@ -590,13 +583,9 @@ def extract_bundle_metadata(file_path):
constants.APP_METADATA_MINIMUM, None) constants.APP_METADATA_MINIMUM, None)
if minimum_supported_k8s_version is None: if minimum_supported_k8s_version is None:
# TODO(ipiresso): Turn this into an error message rather than LOG.error("Minimum supported Kubernetes version missing from {}"
# a warning when the k8s app upgrade implementation is in place .format(file_path))
# and remove the hardcoded value. Also, do not add the bundle to return None
# the database in this scenario.
LOG.warning("Minimum supported Kubernetes version missing from {}"
.format(file_path))
minimum_supported_k8s_version = kubernetes.get_kube_versions()[0]['version']
minimum_supported_k8s_version = minimum_supported_k8s_version.strip().lstrip('v') minimum_supported_k8s_version = minimum_supported_k8s_version.strip().lstrip('v')