Skip to content

Commit

Permalink
[k8s-extension] Update extension CLI to v1.2.5 (#5171)
Browse files Browse the repository at this point in the history
* Create pull.yml

* Update pull.yml

* Update azure-pipelines.yml

* Initial commit of k8s-extension

* Update pipelines file

* Update CODEOWNERS

* Update private preview pipelines

* Remove open service mesh from public release

* Update pipeline files

* Update public extension pipeline

* Change condition variable

* Add version to public preview/private preview

* Update pipelines

* Add different testing based on private branch

* Add annotations to extension model

* Update k8s-custom-pipelines.yml

* Update SDKs with Updated Swagger Spec for 2020-07-01-preview (#13)

* Update sdks with updated swagger spec

* Update version and history rst

* Reorder release history timeline

* Fix ExtensionInstanceForCreate for import

* remove py2 bdist support

* Add custom table formatting

* Remove unnecessary files

* Fix style issues

* Fix branch based on comments

* Update identity piece manually

* Don't handle defaults at the CLI level

* Remove defaults from CLI client

* Check null target namespace with namespace scope

* Update style

* Add cassandra operator and location to model

* Stage Public Version of k8s-extension 0.2.0 for official release (#15)

* Create pull.yml

* Update pull.yml

* Update azure-pipelines.yml

* Initial commit of k8s-extension

* Update pipelines file

* Update CODEOWNERS

* Update private preview pipelines

* Remove open service mesh from public release

* Update pipeline files

* Update public extension pipeline

* Change condition variable

* Add version to public preview/private preview

* Update pipelines

* Add different testing based on private branch

* Add annotations to extension model

* Update k8s-custom-pipelines.yml

* Update SDKs with Updated Swagger Spec for 2020-07-01-preview (#13)

* Update sdks with updated swagger spec

* Update version and history rst

* Reorder release history timeline

* Fix ExtensionInstanceForCreate for import

* remove py2 bdist support

* Add custom table formatting

* Remove unnecessary files

* Fix style issues

* Fix branch based on comments

* Update identity piece manually

* Don't handle defaults at the CLI level

* Remove defaults from CLI client

* Check null target namespace with namespace scope

* Update style

* Add cassandra operator and location to model

Co-authored-by: [email protected] <Action - Fork Sync>

* Remove custom pipelines file

* Update extension description, remove private const

* Update pipeline file

* Disable refs docs

* Update to include better create warning logs and remove update context (#20)

* Update to include better create warning logs and remove update context

* Remove help text for update

* Fix spelling error

* Update message

* Fix k8s-extension conflict with private version

* Fix style errors

* Fix filename

* add customization for microsoft.azureml.kubernetes (#23)

* add customization for microsoft.azureml.kubernetes

* Update release history

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: jonathan-innis <[email protected]>

* Add E2E Testing from Separate branch into internal code (#26)

* Add internal e2e testing

* Change to testing folder

* Inference CLI validation for Scoring FE (#24)

* cli validation starter

* added the call to the fe validation function

* nodeport validation not required

* test fix

Co-authored-by: Jonathan Innis <[email protected]>

* legal warning added (#27)

* Remove deprecated method logger.warn

* Update k8s-custom-pipelines.yml for Azure Pipelines

* Update k8s-custom-pipelines.yml for Azure Pipelines

* Add Azure Defender to E2E testing (#28)

* Add azure defender testing to e2e

* Remove the debug flag

* Add configuration testing

* Fix pipeline failures

* Make test script more intuitive

* Remove parameter from testing

* Fix wrong location for k8s config whl

* Fix pip upgrade issue

* Fix pip install upgrade issue

* Fix pip install issue

* delete resurce in testcase (#29)

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Check Provider is Registered with Subscription Before Making Requests (#18)

* Add check for KubernetesConfiguration

* Disable pylint and rename

* Update provider registration link

* Update version

* Remove extra blank line

* Fix bug in import

* only validate scoring fe when inference is enabled (#31)

* only validate scoring fe when inference is enabled

* Fix versioning

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: jonathan-innis <[email protected]>

* Provider registration case insensitive

* do not validate against scoring fe if inference is not enabled. (#33)

* do not validate against scoring fe if inference is not enabled.

* add inference enabled scenario

* refine

* increase sleeping time

* fix

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Add OSM as Public Preview Extension (#34)

* Add OSM as public preview extension

* Add osm testing

* Add release train to tests

* Fix failing osm test

* Upgrade pip in integration testing

* Remove ununsed import

* Fix release train check in update

* Parallelize E2E Testing (#36)

* Add OSM as public preview extension

* Add osm testing

* Update test logic to parallelize

* Fix test success checking

* Parallelize extension testing

* Better error checking logic

* Fix azureml deletion

* Fix private build (#40)

* change amlk8s to amlarc (#42)

Co-authored-by: Yue Yu <[email protected]>

* Servicebus client model changes (#44)

* Servicebus client model changes

* Fix testing script

* Update history file and pipeline

* Update min cli core version for track 2 updates

* Read SSL cert and key from files (#38)

* first sketch of the change

fixes

removed extra blank lines

changes regarding param renaming

added ssl tests

added more detail to the unit test

additional import

moved pem files out of public folder

fixed import

chenged import

changed import

unit tests fix

unit test fix

fixed unit tests

fixed unit test

unit test fix

changes int test cert and key

* test protected config

* fix test typo

* temporary changes reverted

* fixing tests

* fixed file paths

* removed accidentally added file

* changes according to review comments

* more changes according to review comments

* changes according to review comments

Co-authored-by: Jonathan Innis <[email protected]>

* Upgrade release version

* Liakaz/inference read ssl from file (#47)

* first sketch of the change

fixes

removed extra blank lines

changes regarding param renaming

added ssl tests

added more detail to the unit test

additional import

moved pem files out of public folder

fixed import

chenged import

changed import

unit tests fix

unit test fix

fixed unit tests

fixed unit test

unit test fix

changes int test cert and key

* test protected config

* fix test typo

* temporary changes reverted

* fixing tests

* fixed file paths

* removed accidentally added file

* changes according to review comments

* more changes according to review comments

* changes according to review comments

* fixed decode error

* renamed the experimental param

Co-authored-by: Jonathan Innis <[email protected]>

* Fix style issues (#51)

* Fixed scoring fe related extension param names (#49)

* fixed scoring fe related extension params

* bug fix and style fixes

* variable rename

* fixed the error type

* set cluster to prod by default

* Add distro validation for osm-arc (#50)

* Add distro validation for osm-arc

* fixed indentation

* Fix linting

* Resolve comments

* Add unit test

* fix lint

Co-authored-by: Jonathan Innis <[email protected]>

* Add distro validation for osm-arc (#50)

* Add distro validation for osm-arc

* fixed indentation

* Fix linting

* Resolve comments

* Add unit test

* fix lint

Co-authored-by: Jonathan Innis <[email protected]>

* Add distro validation for osm-arc (#53)

removed release-train logic

* Add Custom Delete Logic for Partners (#54)

* Add custom delete logic

* Fix failing unit tests

* Add warning message when deleting amlarc extension (#55)

* add warning message

* fix indentation

* Update release version

* Remove Pyhelm from OSM customization (#58)

* Fix OSM pyhelm bug

* Debug bootstrap error

* Update release message

* Remove pyhelm dependency

* Update tests to only check extensionconfig creation (#61)

* Update tests to only check extensionconfig creation

* Single set of CRUD for AzureML

* Debug logs for connectedk8s

* Increase open service mesh version number

* Update k8s-extension Models to Track2 (#64)

* Update k8s-extension models to track2

* Add debug for failed cleanup

* Increase version number

* Exit 0 on failed cleanup

* Fix identity in wrong place in model (#66)

* Readd osm-arc distro validation (#62)

* Add distro validation for osm-arc

removed release-train logic

* Readd osm_arc distro validation

* Fix style

* Rm space

* Edit test

* Fixed tests and error logic

* Remove dependency

* Add delete method

Co-authored-by: Jonathan Innis <[email protected]>

* Don't Send Identity Headers If In DF (#67)

* Don't send identity for clusters in dogfood

* Add location to model for identity

* Add identity validation to testing

* Use default extension with identity instead of Cassandra specific (#69)

* Remove the identity check for now

* Add -t for clusterType parameter (#71)

* Adding a flag for AKS to AMLARC migration and set up corresponding FE… (#65)

* Adding a flag for AKS to AMLARC migration and set up corresponding FE helm values

* Remove one extra line

* Adding Scoring FE IS_AKS_MIGRATION check logic for helm values

Co-authored-by: Harry Yang <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* remove version requirement and auto upgrade minor version check (#72)

* Custom User Confirmation for Partners (#70)

* Custom user confirmation

* Check for disable confirm prompty for confirmation

* Add yes to delete command

* Code cleanup and style fixes (#73)

* Enabled identity by default (#74)

* Increase version

* Fix df check and add unit test (#77)

* Bump extension version

* Pin helm version

* Extensions GA changes into Public Branch (#79)

* Add openservicemesh back

* OpenServiceMesh import

* Update osm with new extension model

* Add back private file

* Add Azure ML to list of private extensions (#16)

* Update k8s-custom-pipelines.yml

* Add Microsoft.PolicyInsights extension (#17)

* Add Policy extension

* Update comment

* Update args

* Fix linting errors

Co-authored-by: Jonathan Innis <[email protected]>

* Add HISTORY_private file for private preview

* Change versioning scheme

* Update the code for supporting both extensions at once

* Fix style issue

* Remove old consts file

* change the resource tag from managed_by:amlk8s to created_by:amlk8s-e… (#22)

* change the resource tag from managed_by:amlk8s to created_by:amlk8s-extension

* remove the lock when creating resources

* fix lint

* update version and HISTORY_private.rst

* change error message

Co-authored-by: Yue Yu <[email protected]>

* Update the beta version with upstream

* Update the private history file

* Add upgrade pip to pipeline

* Move pip install within virtualenv

* Merge in k8s-extension/public (0.3.1) (#32)

* delete resurce in testcase (#29)

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Check Provider is Registered with Subscription Before Making Requests (#18)

* Add check for KubernetesConfiguration

* Disable pylint and rename

* Update provider registration link

* Update version

* Remove extra blank line

* Fix bug in import

* only validate scoring fe when inference is enabled (#31)

* only validate scoring fe when inference is enabled

* Fix versioning

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: jonathan-innis <[email protected]>

* Update private release

Co-authored-by: yuyue9284 <[email protected]>
Co-authored-by: Yue Yu <[email protected]>

* Release Version 0.4.0-b1 (#37)

* Merge k8s-extension/public into k8s-extension/private

* Update the version

* Fix testing concurrency

* K8s extension/private 0.4.0b2 (#41)

* Fix private build (#40)

* Update version

* Upgrade to v0.5.2

* Fix policy bug

* Increase private version

* Update consts_private.py

* Increase private version

* Increase version with public

* Add flux to private version

* Update models for 2021-05-01-preview

* Add async models to version

* Add no wait to delete and create

* support managed cluster

* Bump version

* Pin helm version

* Add cmd to delete call

* Add force deletion

* add dapr extension (#78)

Signed-off-by: Ji An Liu <[email protected]>

* Fix failing integration tests

* Adding the GA changes for private branch

* Fix confirm prompt

* Fix update E2E tests

Co-authored-by: jonathan-innis <[email protected]>
Co-authored-by: [email protected] <Action - Fork Sync>
Co-authored-by: nreisch <[email protected]>
Co-authored-by: yuyue9284 <[email protected]>
Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: anagg929 <[email protected]>
Co-authored-by: Ji'an Liu <[email protected]>
Co-authored-by: nanthi <nanthi@NANTHI01>

* Fix configuration settings in update

* Only provide confirmation when specifying settings

* Fix style issues

* Cassandra tests with update (#81)

* Add Microsoft.PolicyInsights extension for public preview (#83)

* Add Azure Policy

* Remove custom configuration and update tests

* Yuyu3/fix upgrade public (#85)

* populate configuration protected settings for azureml

bump version && add log

fetch connection string only if configuration protected settings are set

update ssl key

* bump the version

* reverse changes on version and HISTORY.rst

* inferenceLoadBalancerHA

Co-authored-by: Yue Yu <[email protected]>

* Remove Parallel Powershell Jobs (#82)

* Unparallelize tests

* Moved location of pipeline file

* Remove the parallel invoke expression calls

* Add templates to testing

* Remove policy update test from extension E2E (#88)

* feIsNodePort, feIsInternalLoadBalancer (#87)

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Fix history file

* Add one more prompt for amlarc extension update (#94)

* Add one more prompt for amlarc extension update

* fix pylint issue

* fix pylint issue

* fix pylint issue

* fix pylint issue

Co-authored-by: Youhua Tu <[email protected]>
Co-authored-by: Youhua Tu <[email protected]>

* Update Identity Creation for Appliance to Latest Version (#95)

* Update appliance API to latest version for identity

* Create a utils file with get parent_api_version

* Fix style errors

* Bump version

* Remove additional entry from history

* Do not create identity with appliances (#97)

* Bump version

* support sslSecret (#99)

* support sslSecret

* fix

* fix error message

Co-authored-by: Jun Min <[email protected]>

* Bump version to 1.0.4

* Increase OSM verison to valid version (#104)

* remove inference private review warning message (#102)

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Update unit testing from osm to dapr (#106)

* osm-ext: enable system identities (#105)

* remove inference private review warning message (#109)

Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Build Extension in Template (#110)

* Build extension using a template

* Update build template in run test

* Fix private build issues (#112)

* Upgrade vendored_sdks to 2022-03-01 (#113)

* Upgrade vendored_sdks to 2022-03-01

* Update recordings file

* Bump version and changelog

* Update AzureMLKubernetes install parameters on inferenceRouterServiceType and internalLoadBalancerProvider (#114)

* Add one more prompt for amlarc extension update

* fix pylint issue

* fix pylint issue

* fix pylint issue

* fix pylint issue

* merge from AzureArcForKubernetes/azure-cli-extensions

* Update AzureMLKubernetes install parameters on inferenceRouterServiceType and internalLoadBalancerProvider

* update error message

* update error message

* fix pipeline failures

* fix test failure

Co-authored-by: Youhua Tu <[email protected]>
Co-authored-by: Youhua Tu <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* Change extension validation logic osm-arc (#116)

* added default identity support for microsoft.azurebackup.backupagent (#115)

* Change extension validation logic osm-arc

Signed-off-by: nshankar13 <[email protected]>

Co-authored-by: sangitaray2021 <[email protected]>
Co-authored-by: Jonathan Innis <[email protected]>

* [k8s-extension] Add Managed Identity Auth support for ContainerInsights Extension (#118)

* container insights aad auth support

* container insights aad auth support

* container insights aad auth support

* handle useAADAuth setting

* handle useAADAuth setting

* delete dcr-a if its exists incase of MSI auth

* fix formatting

* fix formatting

* fix formatting

* fix formatting

Co-authored-by: Jonathan Innis <[email protected]>

* fix install issue on aks (#119)

* fix install issue on aks

* Removing checking distribution

Co-authored-by: youhuatu <[email protected]>

* [k8s-extension] Bring back containerInsights solution addition in msi mode (#120)

* bring back containerinsights solution in dcr mode

* bring back containerinsights solution in dcr mode

* Bump release version

* Remove backup agent from mapping

* Fix history file

* clusterip (#121)

* clusterip

* fix pr test

Co-authored-by: Jun Min <[email protected]>

* No default values for the patch scenario with extension (#122)

* Bump version to 1.2.1

* Rename inferenceLoadBalancerHA (#123)

* Rename inferenceLoadBalancerHA

Rename inferenceLoadBalancerHA to inferenceRouterHA and unify related logic

* Update AzureMLKubernetes.py

* Remove unused comments to trigger pipeline

* Update AzureMLKubernetes.py

* Yuyu3/remove relay (#124)

* remove relay

* disable service bus by default, disable relay if target cluster is managed clusters.

* move nginx ingress logic

* remove service bus in tests

* update HISTORY

* If no default values provided for update, assign an empty dict.

* set original_extension_config_settings to empty dict if it is None.

* bump version to 1.2.2

Co-authored-by: Yue Yu <[email protected]>

* Update test documentation for partners (#132)

* remove warning message (#129)

Co-authored-by: Yue Yu <[email protected]>

* Use cluster scale to control clusterPurpose and inferenceRouterHA (#130)

* Use cluster scale to control clusterPurpose and inferenceRouterHA

* Update AzureMLKubernetes.py

To solve transient gate error

* Update AzureMLKubernetes.py

* Update AzureMLKubernetes.py

* Update AzureMLKubernetes.py

Co-authored-by: Jonathan Innis <[email protected]>

* Fix warning message returned on PATCH (#133)

* Do not invoke 'create_or_update' if resource is already exists. (#135)

* init

* update HISTORY

* do not populate clusterPurpose if infrenceRouterHA is not set.

* use correct exception type.

* use correct exception type.

* fix lint

* use correct exception type.

Co-authored-by: Yue Yu <[email protected]>

* [k8s-extension]  ContainerInsights Extension Managed Identity Auth Onboarding updates  (#137)

* bring back containerinsights solution in dcr mode

* bring back containerinsights solution in dcr mode

* update to stream group and DCR API version

* Only test k8s-extension

* [k8s-extension] ContainerInsights Extension Managed Identity Auth Onboarding related bug fixes (#141)

* fix bugs

* fix indent issues

* remove get workspace key for msi auth

* fix pr feedback

* Fix osm-arc installation non-connected clusters

Signed-off-by: nshankar13 <[email protected]>

* k8s-extension azuredefender namespace to mdc (#152)

Co-authored-by: Bsingh16 <[email protected]>

* change codeowners for k8s extension & configuration (#150)

* change codeowners for k8s extension & configuration

* change code owners

Co-authored-by: Bavneet Singh <[email protected]>

* bump k8s-extension version to 1.2.5

* delete testing files

Co-authored-by: Jonathan Innis <[email protected]>
Co-authored-by: [email protected] <Action - Fork Sync>
Co-authored-by: yuyue9284 <[email protected]>
Co-authored-by: Yue Yu <[email protected]>
Co-authored-by: Lia Kazakova <[email protected]>
Co-authored-by: Niranjan Shankar <[email protected]>
Co-authored-by: jingyizhu99 <[email protected]>
Co-authored-by: Harry Yang <[email protected]>
Co-authored-by: Harry Yang <[email protected]>
Co-authored-by: Thomas Stringer <[email protected]>
Co-authored-by: NarayanThiru <[email protected]>
Co-authored-by: nreisch <[email protected]>
Co-authored-by: anagg929 <[email protected]>
Co-authored-by: Ji'an Liu <[email protected]>
Co-authored-by: nanthi <nanthi@NANTHI01>
Co-authored-by: youhuatuyh <[email protected]>
Co-authored-by: Youhua Tu <[email protected]>
Co-authored-by: Youhua Tu <[email protected]>
Co-authored-by: Jun <[email protected]>
Co-authored-by: Jun Min <[email protected]>
Co-authored-by: Sanya Kochhar <[email protected]>
Co-authored-by: sangitaray2021 <[email protected]>
Co-authored-by: Ganga Mahesh Siddem <[email protected]>
Co-authored-by: WangDian <[email protected]>
Co-authored-by: Bavneet Singh <[email protected]>
Co-authored-by: Niv Ben Shabat <[email protected]>
  • Loading branch information
1 parent 67aaaaa commit 85adfec
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@

/src/ssh/ @rlrossiter @danybeam @fengzhou-msft @N6UDP

/src/k8s-configuration/ @NarayanThiru @jonathan-innis
/src/k8s-configuration/ @NarayanThiru @bavneetsingh16 @deeksha345 @anagg929

/src/k8s-extension/ @NarayanThiru @jonathan-innis
/src/k8s-extension/ @NarayanThiru @bavneetsingh16 @deeksha345 @anagg929

/src/log-analytics-solution/ @zhoxing-ms

Expand Down
6 changes: 6 additions & 0 deletions src/k8s-extension/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
Release History
===============

1.2.5
++++++++++++++++++
* microsoft.azuremonitor.containers: ContainerInsights Extension Managed Identity Auth Onboarding related bug fixes.
* microsoft.openservicemesh: Fix osm-arc installations for non-connectedClusters
* k8s-extension azuredefender namespace to mdc

1.2.4
++++++++++++++++++
* microsoft.azureml.kubernetes: Do not invoke `create_or_update` for already existed resources.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
# Hardcoding name, release_namespace and scope since ci only supports one instance and cluster scope
# and platform doesn't have support yet extension specific constraints like this
name = extension_type.lower()
release_namespace = "azuredefender"
release_namespace = "mdc"
# Scope is always cluster
scope_cluster = ScopeCluster(release_namespace=release_namespace)
ext_scope = Scope(cluster=scope_cluster, namespace=None)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,12 @@ def _get_container_insights_settings(cmd, cluster_resource_group_name, cluster_n
raise InvalidArgumentValueError('{} is not a valid Azure resource ID.'.format(workspace_resource_id))

if is_ci_extension_type:
if not _is_container_insights_solution_exists(cmd, workspace_resource_id):
logger.info("creating containerinsights solution resource since it doesnt exist")
_ensure_container_insights_for_monitoring(cmd, workspace_resource_id).result()
if useAADAuth:
logger.info("creating data collection rule and association")
_ensure_container_insights_dcr_for_monitoring(cmd, subscription_id, cluster_resource_group_name, cluster_name, workspace_resource_id)
elif not _is_container_insights_solution_exists(cmd, workspace_resource_id):
logger.info("Creating ContainerInsights solution resource, since it doesn't exist and it is using legacy authentication")
_ensure_container_insights_for_monitoring(cmd, workspace_resource_id).result()

# extract subscription ID and resource group from workspace_resource_id URL
parsed = parse_resource_id(workspace_resource_id)
Expand All @@ -499,16 +499,20 @@ def _get_container_insights_settings(cmd, cluster_resource_group_name, cluster_n
log_analytics_workspace = log_analytics_client.workspaces.get(workspace_rg_name, workspace_name)
if not log_analytics_workspace:
raise InvalidArgumentValueError(
'Fails to retrieve workspace by {}'.format(workspace_name))

shared_keys = log_analytics_client.shared_keys.get_shared_keys(
workspace_rg_name, workspace_name)
if not shared_keys:
raise InvalidArgumentValueError('Fails to retrieve shared key for workspace {}'.format(
log_analytics_workspace))
'Failed to retrieve workspace by {}'.format(workspace_name))

# workspace key not used in case of AAD MSI auth
configuration_protected_settings['omsagent.secret.key'] = "<not_used>"
if not useAADAuth:
shared_keys = log_analytics_client.shared_keys.get_shared_keys(
workspace_rg_name, workspace_name)
if not shared_keys:
raise InvalidArgumentValueError('Failed to retrieve shared key for workspace {}'.format(
log_analytics_workspace))
configuration_protected_settings['omsagent.secret.key'] = shared_keys.primary_shared_key
configuration_protected_settings['omsagent.secret.wsid'] = log_analytics_workspace.customer_id
configuration_settings['logAnalyticsWorkspaceResourceID'] = workspace_resource_id
configuration_protected_settings['omsagent.secret.key'] = shared_keys.primary_shared_key

# set the domain for the ci agent for non azure public clouds
cloud_name = cmd.cli_ctx.cloud.name
if cloud_name.lower() == 'azurechinacloud':
Expand Down Expand Up @@ -562,6 +566,9 @@ def _ensure_container_insights_dcr_for_monitoring(cmd, subscription_id, cluster_
try:
resource = resources.get_by_id(workspace_resource_id, '2015-11-01-preview')
workspace_region = resource.location
# location can have spaces for example 'East US'
# and some workspaces it will be "eastus" hence remove the spaces and converting lowercase
workspace_region = workspace_region.replace(" ", "").lower()
except HttpResponseError as ex:
raise ex

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
# NOTE-2: Return a valid Extension object, Instance name and flag for Identity
create_identity = True

_validate_tested_distro(cmd, resource_group_name, cluster_name, version, release_train)
if cluster_type == "connectedClusters":
_validate_tested_distro(cmd, resource_group_name, cluster_name, version, release_train)

extension = Extension(
extension_type=extension_type,
Expand All @@ -70,6 +71,7 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t

def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, extension_version, extension_release_train):

logger.warning("Running validated distros...")
field_unavailable_error = '\"testedDistros\" field unavailable for version {0} of microsoft.openservicemesh, ' \
'cannot determine if this Kubernetes distribution has been properly tested'.format(extension_version)

Expand Down
2 changes: 1 addition & 1 deletion src/k8s-extension/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# TODO: Add any additional SDK dependencies here
DEPENDENCIES = []

VERSION = "1.2.4"
VERSION = "1.2.5"

with open("README.rst", "r", encoding="utf-8") as f:
README = f.read()
Expand Down

0 comments on commit 85adfec

Please sign in to comment.