Skip to content

Commit

Permalink
abiyer/add more lowbandwith scenarios in akshci (#6829)
Browse files Browse the repository at this point in the history
* Add more low bandwidth scenarios in AKS HCI

* convert user inputs to lowercase

* Bump connectedk8s version to 1.5.1
  • Loading branch information
9lash authored Oct 4, 2023
1 parent fdaa513 commit ade356a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
3 changes: 3 additions & 0 deletions src/connectedk8s/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Release History
===============
1.5.1
++++++
* Skip onboarding pre-checks for AKS-HCI with additional distros : [aks_management, aks_edge_k8s, aks_edge_k3s]

1.5.0
++++++
Expand Down
20 changes: 11 additions & 9 deletions src/connectedk8s/azext_connectedk8s/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat

required_node_exists = check_linux_node(node_api_response)

# check if this is AKS_HCI
aks_hci = False
if distribution == 'aks_workload' and infrastructure == 'azure_stack_hci':
aks_hci = True
# check if this is aks_hci low bandwith scenario
lowbandwidth = False
lowbandwith_distros = ["aks_workload", "aks_management", "aks_edge_k3s", "aks_edge_k8s"]

if (infrastructure.lower() == 'azure_stack_hci') and (distribution.lower() in lowbandwith_distros):
lowbandwidth = True

# Install kubectl and helm
try:
Expand All @@ -174,8 +176,8 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
# Pre onboarding checks
diagnostic_checks = "Failed"
try:
# if aks_hci skip, otherwise continue to perform pre-onboarding check
if not aks_hci:
# if aks_hci lowbandwidth scenario skip, otherwise continue to perform pre-onboarding check
if not lowbandwidth:
batchv1_api_instance = kube_client.BatchV1Api()
storage_space_available = True

Expand Down Expand Up @@ -218,7 +220,7 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
raise ManualInterrupt('Process terminated externally.')

# If the checks didnt pass then stop the onboarding
if diagnostic_checks != consts.Diagnostic_Check_Passed and aks_hci is False:
if diagnostic_checks != consts.Diagnostic_Check_Passed and lowbandwidth is False:
if storage_space_available:
logger.warning("The pre-check result logs logs have been saved at this path:" + filepath_with_timestamp + " .\nThese logs can be attached while filing a support ticket for further assistance.\n")
if(diagnostic_checks == consts.Diagnostic_Check_Incomplete):
Expand All @@ -228,10 +230,10 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, correlat
telemetry.set_exception(exception='Cluster Diagnostic Prechecks Failed', fault_type=consts.Cluster_Diagnostic_Prechecks_Failed, summary="Cluster Diagnostic Prechecks Failed in the cluster")
raise ValidationError("One or more pre-onboarding diagnostic checks failed and hence not proceeding with cluster onboarding. Please resolve them and try onboarding again.")

if aks_hci is False:
if lowbandwidth is False:
print("The required pre-checks for onboarding have succeeded.")
else:
print("Skipped onboarding pre-checks for AKS-HCI. Continuing...")
print("Skipped onboarding pre-checks for AKS-HCI low bandwidth scenario. Continuing...")

if not required_node_exists:
telemetry.set_user_fault()
Expand Down
2 changes: 1 addition & 1 deletion src/connectedk8s/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# TODO: Confirm this is the right version number you want and it matches your
# HISTORY.rst entry.

VERSION = '1.5.0'
VERSION = '1.5.1'

# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down

0 comments on commit ade356a

Please sign in to comment.