Skip to content
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.

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

[k8s-extension] Release v1.1.0 with Updated Models for 2022-03-01 #4588

Merged
merged 192 commits into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
828f9d3
Create pull.yml
jonathan-innis Mar 10, 2021
1436bfc
Update pull.yml
jonathan-innis Mar 10, 2021
6cffd96
Update azure-pipelines.yml
jonathan-innis Mar 10, 2021
db0f4bd
Initial commit of k8s-extension
jonathan-innis Mar 10, 2021
3e2ea64
Update pipelines file
jonathan-innis Mar 10, 2021
9bbc0e4
Update CODEOWNERS
jonathan-innis Mar 10, 2021
8d46cbc
Update private preview pipelines
jonathan-innis Mar 11, 2021
6c3ba41
Remove open service mesh from public release
jonathan-innis Mar 11, 2021
a98e996
Merge pull request #6 from Azure/master
jonathan-innis Mar 11, 2021
43c6796
Update pipeline files
jonathan-innis Mar 11, 2021
009a83e
Update public extension pipeline
jonathan-innis Mar 12, 2021
8e058c5
Change condition variable
jonathan-innis Mar 12, 2021
dea40c1
Add version to public preview/private preview
jonathan-innis Mar 12, 2021
69269e0
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
jonathan-innis Mar 12, 2021
e81e010
Update pipelines
jonathan-innis Mar 12, 2021
9621a48
Add different testing based on private branch
jonathan-innis Mar 12, 2021
862a035
Add annotations to extension model
jonathan-innis Mar 12, 2021
e1c3d12
Update k8s-custom-pipelines.yml
jonathan-innis Mar 15, 2021
3e309bf
Update SDKs with Updated Swagger Spec for 2020-07-01-preview (#13)
jonathan-innis Mar 16, 2021
1df2ef5
remove py2 bdist support
jonathan-innis Mar 16, 2021
054a903
Add custom table formatting
jonathan-innis Mar 16, 2021
b298252
Remove unnecessary files
jonathan-innis Mar 16, 2021
afb4046
Fix style issues
jonathan-innis Mar 16, 2021
49b7eac
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 17, 2021
a13304d
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 17, 2021
aa078b0
Merge branch 'release' into k8s-extension/public
jonathan-innis Mar 17, 2021
21dff06
Fix branch based on comments
jonathan-innis Mar 17, 2021
93919f2
Update identity piece manually
jonathan-innis Mar 17, 2021
a88127a
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis Mar 17, 2021
7e40b3a
Don't handle defaults at the CLI level
jonathan-innis Mar 17, 2021
483202c
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 17, 2021
d1befa8
Remove defaults from CLI client
jonathan-innis Mar 17, 2021
c7bd93f
Merge branch 'release' into k8s-extension/public
jonathan-innis Mar 17, 2021
076827c
Check null target namespace with namespace scope
jonathan-innis Mar 17, 2021
550eea1
Update style
jonathan-innis Mar 17, 2021
1a17f1b
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis Mar 17, 2021
fbab3be
Add cassandra operator and location to model
jonathan-innis Mar 17, 2021
9aade9f
Stage Public Version of k8s-extension 0.2.0 for official release (#15)
jonathan-innis Mar 18, 2021
7f79cfb
Remove custom pipelines file
jonathan-innis Mar 18, 2021
1337996
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 19, 2021
f6e68e9
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 20, 2021
f57af40
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 20, 2021
e75f329
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 23, 2021
a47b63a
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 23, 2021
6c4e0e6
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 24, 2021
bb88024
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 24, 2021
9f06b49
Update extension description, remove private const
jonathan-innis Mar 24, 2021
a063594
Merge branch 'release' into k8s-extension/public
jonathan-innis Mar 24, 2021
eb4c58b
Update pipeline file
jonathan-innis Mar 24, 2021
20d809c
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 25, 2021
9524cda
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 25, 2021
16489b8
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 26, 2021
ee395f2
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 26, 2021
fbd331c
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 27, 2021
9c86220
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 27, 2021
89828c5
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Mar 31, 2021
bed066c
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Mar 31, 2021
8011213
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 1, 2021
491c1e5
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Apr 1, 2021
cfd267d
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 2, 2021
b9d1778
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Apr 2, 2021
3290f6e
Disable refs docs
jonathan-innis Apr 2, 2021
22c8e92
Update to include better create warning logs and remove update contex…
jonathan-innis Apr 2, 2021
12212f1
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 3, 2021
010e9a8
Merge branch 'release' of https://github.com/AzureArcForKubernetes/az…
Apr 3, 2021
6bbf418
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 11, 2021
df82dd8
Fix k8s-extension conflict with private version
jonathan-innis Apr 14, 2021
0228851
Fix style errors
jonathan-innis Apr 14, 2021
db4c5b2
Fix filename
jonathan-innis Apr 14, 2021
2971d69
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 18, 2021
5077192
add customization for microsoft.azureml.kubernetes (#23)
yuyue9284 Apr 23, 2021
dc0c178
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
Apr 25, 2021
3d15151
Add E2E Testing from Separate branch into internal code (#26)
jonathan-innis Apr 26, 2021
1ded405
Inference CLI validation for Scoring FE (#24)
liakaz Apr 27, 2021
53303d5
legal warning added (#27)
liakaz Apr 27, 2021
3370264
Remove deprecated method logger.warn
jonathan-innis Apr 27, 2021
4c66aef
Update k8s-custom-pipelines.yml for Azure Pipelines
jonathan-innis Apr 27, 2021
e8651f2
Update k8s-custom-pipelines.yml for Azure Pipelines
jonathan-innis Apr 27, 2021
9de1e4e
Add Azure Defender to E2E testing (#28)
jonathan-innis Apr 28, 2021
9c0317d
Add configuration testing
jonathan-innis Apr 28, 2021
4c21482
Fix pipeline failures
jonathan-innis Apr 28, 2021
3e2fb15
Make test script more intuitive
jonathan-innis Apr 29, 2021
4dca64d
Remove parameter from testing
jonathan-innis Apr 29, 2021
c93e958
Fix wrong location for k8s config whl
jonathan-innis Apr 29, 2021
27e9b4a
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
jonathan-innis May 3, 2021
cb30f9d
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
May 3, 2021
7276f4a
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis May 6, 2021
3dafc08
Fix pip upgrade issue
jonathan-innis May 6, 2021
c5bd1c2
Fix pip install upgrade issue
jonathan-innis May 6, 2021
d9e8760
Fix pip install issue
jonathan-innis May 6, 2021
9709504
delete resurce in testcase (#29)
yuyue9284 May 7, 2021
3f620a8
Check Provider is Registered with Subscription Before Making Requests…
jonathan-innis May 7, 2021
cf95612
only validate scoring fe when inference is enabled (#31)
yuyue9284 May 11, 2021
fea6e00
Provider registration case insensitive
jonathan-innis May 11, 2021
877868c
do not validate against scoring fe if inference is not enabled. (#33)
yuyue9284 May 13, 2021
7ea157b
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
jonathan-innis May 13, 2021
a50ade7
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis May 13, 2021
9b1bedd
Add OSM as Public Preview Extension (#34)
jonathan-innis May 13, 2021
257dbf3
Fix release train check in update
jonathan-innis May 14, 2021
a203575
Parallelize E2E Testing (#36)
jonathan-innis May 14, 2021
8d65189
Fix azureml deletion
jonathan-innis May 14, 2021
ec14c6d
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis May 14, 2021
918bc02
Fix private build (#40)
jonathan-innis May 21, 2021
8b2490d
change amlk8s to amlarc (#42)
yuyue9284 May 25, 2021
724acde
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
jonathan-innis May 27, 2021
9100ff5
Servicebus client model changes (#44)
jonathan-innis May 27, 2021
6955567
Read SSL cert and key from files (#38)
liakaz Jun 2, 2021
a46235b
Upgrade release version
jonathan-innis Jun 2, 2021
b0f25af
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
jonathan-innis Jun 2, 2021
2889d53
Liakaz/inference read ssl from file (#47)
liakaz Jun 3, 2021
67babd8
Fix style issues (#51)
jonathan-innis Jun 4, 2021
590e642
Fixed scoring fe related extension param names (#49)
liakaz Jun 8, 2021
fc661a8
Add distro validation for osm-arc (#50)
nshankar13 Jun 11, 2021
eb466aa
Add distro validation for osm-arc (#50)
nshankar13 Jun 11, 2021
b9b932a
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis Jun 11, 2021
b0af598
Add distro validation for osm-arc (#53)
nshankar13 Jun 15, 2021
c355ad5
Add Custom Delete Logic for Partners (#54)
jonathan-innis Jun 22, 2021
cda5e41
Add warning message when deleting amlarc extension (#55)
jingyizhu99 Jun 23, 2021
c423e54
Update release version
jonathan-innis Jun 24, 2021
0080c80
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jun 24, 2021
58b4df8
Remove Pyhelm from OSM customization (#58)
jonathan-innis Jul 9, 2021
0b56023
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 9, 2021
7712f52
Update release message
jonathan-innis Jul 9, 2021
4ca94bd
Remove pyhelm dependency
jonathan-innis Jul 9, 2021
de426d4
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 9, 2021
0336667
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 9, 2021
5bfabdb
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 9, 2021
a5ef607
Update tests to only check extensionconfig creation (#61)
jonathan-innis Jul 9, 2021
79bb7b2
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 19, 2021
fb8682a
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis Jul 19, 2021
d8528be
Increase open service mesh version number
jonathan-innis Jul 19, 2021
64ac05a
Update k8s-extension Models to Track2 (#64)
jonathan-innis Jul 20, 2021
a862b09
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 20, 2021
bf15d99
Fix identity in wrong place in model (#66)
jonathan-innis Jul 23, 2021
65edba6
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jul 23, 2021
bc48fdb
Readd osm-arc distro validation (#62)
nshankar13 Jul 27, 2021
ec40c30
Merge branch 'Azure:main' into k8s-extension/public
jonathan-innis Jul 27, 2021
611b81f
Don't Send Identity Headers If In DF (#67)
jonathan-innis Jul 27, 2021
a0431a6
Use default extension with identity instead of Cassandra specific (#69)
jonathan-innis Jul 28, 2021
6c271d5
Merge branch 'Azure:main' into k8s-extension/public
jonathan-innis Jul 28, 2021
a2a4050
Remove the identity check for now
jonathan-innis Jul 28, 2021
52d3fad
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Aug 11, 2021
30b407c
Add -t for clusterType parameter (#71)
jonathan-innis Aug 11, 2021
ac02d5a
Adding a flag for AKS to AMLARC migration and set up corresponding FE…
tianchijushi Aug 12, 2021
3a293ed
remove version requirement and auto upgrade minor version check (#72)
trstringer Aug 24, 2021
7deb020
Custom User Confirmation for Partners (#70)
jonathan-innis Aug 24, 2021
dd991f0
Code cleanup and style fixes (#73)
jonathan-innis Aug 27, 2021
01deb1e
Enabled identity by default (#74)
jonathan-innis Aug 27, 2021
8f9386c
Increase version
jonathan-innis Aug 30, 2021
03a376e
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Aug 30, 2021
e51eb49
Fix df check and add unit test (#77)
jonathan-innis Sep 13, 2021
aa1093a
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Sep 13, 2021
a69aaa5
Bump extension version
jonathan-innis Sep 13, 2021
1e0c547
Pin helm version
jonathan-innis Sep 20, 2021
f721c84
Merge branch 'Azure:main' into k8s-extension/public
jonathan-innis Oct 14, 2021
bd56e41
Extensions GA changes into Public Branch (#79)
NarayanThiru Oct 19, 2021
544af52
Fix configuration settings in update
jonathan-innis Oct 20, 2021
338895b
Only provide confirmation when specifying settings
jonathan-innis Oct 20, 2021
a54aca2
Fix style issues
jonathan-innis Oct 20, 2021
9f06921
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Oct 22, 2021
b4b0b0e
Cassandra tests with update (#81)
jonathan-innis Oct 26, 2021
d545111
Add Microsoft.PolicyInsights extension for public preview (#83)
nreisch Oct 27, 2021
ef59f15
Yuyu3/fix upgrade public (#85)
yuyue9284 Nov 9, 2021
b2eaf5e
Remove Parallel Powershell Jobs (#82)
jonathan-innis Nov 9, 2021
5f6aea5
Remove policy update test from extension E2E (#88)
jonathan-innis Nov 9, 2021
02672fa
feIsNodePort, feIsInternalLoadBalancer (#87)
yuyue9284 Nov 10, 2021
42e24b3
Fix history file
jonathan-innis Dec 1, 2021
b0cc9fd
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Dec 1, 2021
ba2ebb5
Add one more prompt for amlarc extension update (#94)
youhuatuyh Dec 7, 2021
0f3c9d1
Update Identity Creation for Appliance to Latest Version (#95)
jonathan-innis Dec 8, 2021
53c9205
Bump version
jonathan-innis Dec 8, 2021
82a77c4
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Dec 8, 2021
00e540c
Remove additional entry from history
jonathan-innis Dec 8, 2021
2ebd9c4
Do not create identity with appliances (#97)
jonathan-innis Dec 13, 2021
9ae1c03
Bump version
jonathan-innis Dec 13, 2021
7e5446b
Merge branch 'k8s-extension/public' of github.com:AzureArcForKubernet…
jonathan-innis Dec 13, 2021
e20b786
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Dec 13, 2021
e781aeb
support sslSecret (#99)
mjaow Dec 27, 2021
d4b4051
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Jan 3, 2022
2383b75
Bump version to 1.0.4
jonathan-innis Jan 3, 2022
a81c4fc
Increase OSM verison to valid version (#104)
jonathan-innis Feb 23, 2022
ff845c7
remove inference private review warning message (#102)
yuyue9284 Feb 24, 2022
0d74de6
Update unit testing from osm to dapr (#106)
jonathan-innis Mar 8, 2022
b82030f
osm-ext: enable system identities (#105)
SanyaKochhar Mar 8, 2022
b34977b
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Mar 11, 2022
3be9ccb
remove inference private review warning message (#109)
yuyue9284 Mar 17, 2022
0fbfcd5
Build Extension in Template (#110)
jonathan-innis Mar 17, 2022
169fe2c
Fix private build issues (#112)
jonathan-innis Mar 18, 2022
2d986fd
Upgrade vendored_sdks to 2022-03-01 (#113)
jonathan-innis Mar 24, 2022
e32960d
Merge branch 'main' of https://github.com/Azure/azure-cli-extensions …
jonathan-innis Mar 28, 2022
4d3e5ab
Bump version and changelog
jonathan-innis Mar 28, 2022
e6982c5
Remove unneeded files
jonathan-innis Mar 28, 2022
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
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.1.0
++++++++++++++++++
* Migrate Extensions api-version to 2022-03-01
* microsoft.azureml.kubernetes: Remove inference private review warning message
* microsoft.openservicemesh: Enable System-assigned identity

1.0.4
++++++++++++++++++
* microsoft.azureml.kubernetes: Support SSL secret
Expand Down
2 changes: 1 addition & 1 deletion src/k8s-extension/azext_k8s_extension/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# pylint: disable=unused-argument,too-many-locals

from azext_k8s_extension.utils import (
from .utils import (
get_cluster_rp_api_version,
is_dogfood_cluster,
read_config_settings_file,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import copy
from hashlib import md5
from typing import Any, Dict, List, Tuple
from azext_k8s_extension.utils import get_cluster_rp_api_version
from ..utils import get_cluster_rp_api_version

import azure.mgmt.relay
import azure.mgmt.relay.models
Expand Down Expand Up @@ -339,7 +339,6 @@ def __validate_config(self, configuration_settings, configuration_protected_sett
enable_inference = str(enable_inference).lower() == 'true'

if enable_inference:
logger.warning("The installed AzureML extension for AML inference is experimental and not covered by customer support. Please use with discretion.")
self.__validate_scoring_fe_settings(configuration_settings, configuration_protected_settings, release_namespace)
self.__set_up_inference_ssl(configuration_settings, configuration_protected_settings)
elif not (enable_training or enable_inference):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
ext_scope = Scope(cluster=scope_cluster, namespace=None)

# NOTE-2: Return a valid Extension object, Instance name and flag for Identity
create_identity = False
create_identity = True

_validate_tested_distro(cmd, resource_group_name, cluster_name, version)

Expand Down Expand Up @@ -83,7 +83,7 @@ def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, exte
cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Kubernetes' \
'/connectedClusters/{2}'.format(subscription_id, cluster_resource_group_name, cluster_name)

resource = resources.get_by_id(cluster_resource_id, '2020-01-01-preview')
resource = resources.get_by_id(cluster_resource_id, '2021-10-01')
cluster_distro = resource.properties['distribution'].lower()

if cluster_distro == "general":
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,20 @@
class K8sExtensionScenarioTest(ScenarioTest):
@record_only()
def test_k8s_extension(self):
resource_type = 'microsoft.openservicemesh'
extension_type = 'microsoft.dapr'
self.kwargs.update({
'name': 'openservicemesh',
'rg': 'nanthirg1006',
'cluster_name': 'nanthiaks1006',
'name': 'dapr',
'rg': 'azurecli-tests',
'cluster_name': 'arc-cluster',
'cluster_type': 'connectedClusters',
'extension_type': resource_type,
'release_train': 'pilot',
'version': '0.9.2'
'extension_type': extension_type,
'release_train': 'stable',
'version': '1.6.0',
})

self.cmd('k8s-extension create -g {rg} -n {name} -c {cluster_name} --cluster-type {cluster_type} '
'--extension-type {extension_type} --release-train {release_train} --version {version}',
checks=[
self.check('name', '{name}'),
self.check('releaseTrain', '{release_train}'),
self.check('version', '{version}'),
self.check('resourceGroup', '{rg}'),
self.check('extensionType', '{extension_type}')
]
)
'--extension-type {extension_type} --release-train {release_train} --version {version} '
'--no-wait')

# Update requires agent running in k8s cluster that is connected to Azure - so no update tests here
# self.cmd('k8s-extension update -g {rg} -n {name} --tags foo=boo', checks=[
Expand All @@ -45,7 +38,7 @@ def test_k8s_extension(self):
installed_exts = self.cmd('k8s-extension list -c {cluster_name} -g {rg} --cluster-type {cluster_type}').get_output_in_json()
found_extension = False
for item in installed_exts:
if item['extensionType'] == resource_type:
if item['extensionType'] == extension_type:
found_extension = True
break
self.assertTrue(found_extension)
Expand All @@ -58,12 +51,12 @@ def test_k8s_extension(self):
self.check('extensionType', '{extension_type}')
])

self.cmd('k8s-extension delete -g {rg} -c {cluster_name} -n {name} --cluster-type {cluster_type} -y')
self.cmd('k8s-extension delete -g {rg} -c {cluster_name} -n {name} --cluster-type {cluster_type} --force -y')

installed_exts = self.cmd('k8s-extension list -c {cluster_name} -g {rg} --cluster-type {cluster_type}').get_output_in_json()
found_extension = False
for item in installed_exts:
if item['extensionType'] == resource_type:
if item['extensionType'] == extension_type:
found_extension = True
break
self.assertFalse(found_extension)
2 changes: 1 addition & 1 deletion src/k8s-extension/azext_k8s_extension/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import json
from typing import Tuple
from urllib.parse import urlparse
from azext_k8s_extension import consts
from . import consts
from azure.cli.core.azclierror import InvalidArgumentValueError


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# --------------------------------------------------------------------------

from ._source_control_configuration_client import SourceControlConfigurationClient
from ._version import VERSION

__version__ = VERSION
__all__ = ['SourceControlConfigurationClient']

try:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING

from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy

from ._version import VERSION

Expand All @@ -20,7 +22,6 @@

from azure.core.credentials import TokenCredential


class SourceControlConfigurationClientConfiguration(Configuration):
"""Configuration for SourceControlConfigurationClient.

Expand Down Expand Up @@ -48,9 +49,8 @@ def __init__(

self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2021-09-01"
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'mgmt-kubernetesconfiguration/{}'.format(VERSION))
kwargs.setdefault('sdk_moniker', 'azure-mgmt-kubernetesconfiguration/{}'.format(VERSION))
self._configure(**kwargs)

def _configure(
Expand All @@ -68,4 +68,4 @@ def _configure(
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
self.authentication_policy = kwargs.get('authentication_policy')
if self.credential and not self.authentication_policy:
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)
105 changes: 0 additions & 105 deletions src/k8s-extension/azext_k8s_extension/vendored_sdks/_metadata.json

This file was deleted.

Loading