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.

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

Check Provider is Registered with Subscription Before Making Requests #18

Merged
merged 8 commits into from
May 7, 2021
Merged

Check Provider is Registered with Subscription Before Making Requests #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0125ad7
Add check for KubernetesConfiguration
jonathan-innis Apr 1, 2021
6c10657
Disable pylint and rename
jonathan-innis Apr 1, 2021
f0e6e50
Update provider registration link
jonathan-innis May 3, 2021
62a6baa
Merge branch 'k8s-extension/public' into joinnis/check-provider
jonathan-innis May 3, 2021
75971db
Update version
jonathan-innis May 3, 2021
f5f0448
Remove extra blank line
jonathan-innis May 3, 2021
c0e2ef0
Merge branch 'k8s-extension/public' into joinnis/check-provider
jonathan-innis May 7, 2021
799df83
Fix bug in import
jonathan-innis May 7, 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
Prev Previous commit
Next Next commit
Disable pylint and rename
  • Loading branch information
@jonathan-innis
jonathan-innis committed Apr 1, 2021
commit 6c10657a1f2478d2262780f543d5c8a73129d1dc
3 changes: 2 additions & 1 deletion src/k8s-extension/azext_k8s_extension/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
logger = get_logger(__name__)


def check_cc_registration(cmd):
# pylint: disable=broad-except
def _validate_cc_registration(cmd):
try:
rp_client = _resource_providers_client(cmd.cli_ctx)
registration_state = rp_client.get(consts.PROVIDER_NAMESPACE).registration_state
Expand Down
4 changes: 2 additions & 2 deletions src/k8s-extension/azext_k8s_extension/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from azext_k8s_extension.vendored_sdks.models import ConfigurationIdentity
from azext_k8s_extension.vendored_sdks.models import ErrorResponseException
from azext_k8s_extension.vendored_sdks.models import Scope
from azext_k8s_extension._validators import check_cc_registration
from azext_k8s_extension._validators import _validate_cc_registration

from azext_k8s_extension.partner_extensions.ContainerInsights import ContainerInsights
from azext_k8s_extension.partner_extensions.AzureDefender import AzureDefender
Expand Down Expand Up @@ -134,7 +134,7 @@ def create_k8s_extension(cmd, client, resource_group_name, cluster_name, name, c
__validate_scope_after_customization(extension_instance.scope)

# Check that registration has been done on Microsoft.KubernetesConfiguration for the subscription
check_cc_registration(cmd)
_validate_cc_registration(cmd)

# Create identity, if required
if create_identity:
Expand Down