Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Remove release-train custom logic for OpenServiceMesh #53

Merged
jonathan-innis merged 2 commits into from
Jun 15, 2021
Merged

Remove release-train custom logic for OpenServiceMesh #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683019d
Add distro validation for osm-arc
nshankar13 Jun 4, 2021
86e1af1
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
nshankar13 Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions src/k8s-extension/azext_k8s_extension/partner_extensions/OpenServiceMesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,15 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
scope_cluster = ScopeCluster(release_namespace=release_namespace)
ext_scope = Scope(cluster=scope_cluster, namespace=None)

valid_release_trains = ['staging', 'pilot']
# If release-train is not input, set it to 'stable'
if release_train is None:
# version is a mandatory if release-train is staging or pilot
if version is None:
raise RequiredArgumentMissingError(
"A release-train must be provided. Valid values are 'staging', 'pilot'."
)

if release_train.lower() in valid_release_trains:
# version is a mandatory if release-train is staging or pilot
if version is None:
raise RequiredArgumentMissingError(
"A version must be provided for release-train {}.".format(release_train)
)
# If the release-train is 'staging' or 'pilot' then auto-upgrade-minor-version MUST be set to False
if auto_upgrade_minor_version or auto_upgrade_minor_version is None:
auto_upgrade_minor_version = False
logger.warning("Setting auto-upgrade-minor-version to False since release-train is '%s'", release_train)
else:
raise InvalidArgumentValueError(
"Invalid release-train '{}'. Valid values are 'staging', 'pilot'.".format(release_train)
"A version must be provided for release-train {}.".format(release_train)
)
# If the release-train is 'staging' or 'pilot' then auto-upgrade-minor-version MUST be set to False
if auto_upgrade_minor_version or auto_upgrade_minor_version is None:
auto_upgrade_minor_version = False
logger.warning("Setting auto-upgrade-minor-version to False since release-train is '%s'", release_train)

# NOTE-2: Return a valid ExtensionInstance object, Instance name and flag for Identity
create_identity = False
Expand Down