Skip to content

Update API for Aks Edge Essentials #6873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanzhudd merged 14 commits into from
Oct 25, 2023
Merged

Update API for Aks Edge Essentials #6873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
89c4419
Task 25281639: Adding kubernetes distro check in az connectedk8s for …
9lash Oct 6, 2023
3b7b1d0
Add print statements for seeing the cmd_helm_install
9lash Oct 6, 2023
3610142
Merge branch 'Azure:main' into aks-edge-essentials
9lash Oct 18, 2023
c1000ee
Merge branch 'Azure:main' into aks-edge-essentials
9lash Oct 18, 2023
b83b313
move get aks edge calls above providerID
9lash Oct 19, 2023
3c8ed9f
Merge branch 'Azure:main' into aks-edge-essentials
9lash Oct 20, 2023
07f9072
remove debug statements
9lash Oct 20, 2023
f18cc7c
remove whitespaces
9lash Oct 20, 2023
37498f3
rm whitespaces
9lash Oct 20, 2023
9f8b63b
minor fix
9lash Oct 20, 2023
b54d8fa
rm trailing white spaces
9lash Oct 20, 2023
12afacf
rm whitespaces
9lash Oct 20, 2023
33d0a16
Fix get api calls
9lash Oct 23, 2023
7a3bfab
Merge branch 'Azure:main' into aks-edge-essentials
9lash Oct 23, 2023
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
3 changes: 3 additions & 0 deletions src/connectedk8s/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Release History
===============
1.5.3
++++++
* Add support to get AKS-EE kubernetes distro
Copy link
Contributor

@yanzhudd yanzhudd Oct 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is suggested to specify the related command of this change.

Copy link
Contributor Author

@9lash 9lash Oct 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no command related to this change. This change introduces support for a new infrastructure and distribution. Basically, whenever the regular onboarding command az connectedk8s connect command is run on aks_edge_essential infrastructure (node), this change will return the appropriate name of the distribution for aks-edge-essential node.


1.5.2
++++++
Expand Down
4 changes: 4 additions & 0 deletions src/connectedk8s/azext_connectedk8s/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,10 @@ def get_kubernetes_distro(api_response): # Heuristic
return "eks"
if labels.get("minikube.k8s.io/version"):
return "minikube"
if annotations.get("node.aksedge.io/distro") == 'aks_edge_k3s':
return "aks_edge_k3s"
if annotations.get("node.aksedge.io/distro") == 'aks_edge_k8s':
return "aks_edge_k8s"
if provider_id.startswith("kind://"):
return "kind"
if provider_id.startswith("k3s://"):
Expand Down
2 changes: 1 addition & 1 deletion src/connectedk8s/setup.py
View file
Open in desktop
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.2'
VERSION = '1.5.3'

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