From afe2528f4db7b7ae1fc73ba664d825d018ba179a Mon Sep 17 00:00:00 2001 From: Dong Liu Date: Fri, 11 Nov 2022 14:02:01 +0800 Subject: [PATCH 1/2] [AKS] Update preview flag --- src/aks-preview/azext_aks_preview/_params.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py index 026a70c31c3..cc75c7bcbda 100644 --- a/src/aks-preview/azext_aks_preview/_params.py +++ b/src/aks-preview/azext_aks_preview/_params.py @@ -318,8 +318,8 @@ def load_arguments(self, _): c.argument('enable_pod_security_policy', action='store_true') c.argument('enable_pod_identity', action='store_true') c.argument('enable_pod_identity_with_kubenet', action='store_true') - c.argument('enable_workload_identity', arg_type=get_three_state_flag()) - c.argument('enable_oidc_issuer', action='store_true', is_preview=True) + c.argument('enable_workload_identity', arg_type=get_three_state_flag(), is_preview=True) + c.argument('enable_oidc_issuer', action='store_true') c.argument('enable_azure_keyvault_kms', action='store_true') c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id) c.argument('azure_keyvault_kms_key_vault_network_access', arg_type=get_enum_type(keyvault_network_access_types), default=CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PUBLIC) @@ -420,8 +420,8 @@ def load_arguments(self, _): c.argument('enable_pod_identity', action='store_true') c.argument('enable_pod_identity_with_kubenet', action='store_true') c.argument('disable_pod_identity', action='store_true') - c.argument('enable_workload_identity', arg_type=get_three_state_flag()) - c.argument('enable_oidc_issuer', action='store_true', is_preview=True) + c.argument('enable_workload_identity', arg_type=get_three_state_flag(), is_preview=True) + c.argument('enable_oidc_issuer', action='store_true') c.argument('enable_azure_keyvault_kms', action='store_true') c.argument('disable_azure_keyvault_kms', action='store_true') c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id) From 4722bf5536d2c3cf05697b9f31050cce98c8ecf7 Mon Sep 17 00:00:00 2001 From: Dong Liu Date: Mon, 14 Nov 2022 14:02:42 +0800 Subject: [PATCH 2/2] fixup! [AKS] Update preview flag --- src/aks-preview/azext_aks_preview/_help.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py index d20e31c4150..f6a06e2e67a 100644 --- a/src/aks-preview/azext_aks_preview/_help.py +++ b/src/aks-preview/azext_aks_preview/_help.py @@ -372,7 +372,7 @@ short-summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin. - name: --enable-workload-identity type: bool - short-summary: Enable workload identity addon. + short-summary: (PREVIEW) Enable workload identity addon. - name: --disable-disk-driver type: bool short-summary: Disable AzureDisk CSI Driver. @@ -438,7 +438,7 @@ short-summary: The source cluster snapshot id is used to create new cluster. - name: --enable-oidc-issuer type: bool - short-summary: (PREVIEW) Enable OIDC issuer. + short-summary: Enable OIDC issuer. - name: --crg-id type: string short-summary: The crg-id used to associate the new cluster with the existed Capacity Reservation Group resource. @@ -720,7 +720,7 @@ short-summary: (PREVIEW) Disable Pod Identity addon for cluster. - name: --enable-workload-identity type: bool - short-summary: Enable Workload Identity addon for cluster. + short-summary: (PREVIEW) Enable Workload Identity addon for cluster. - name: --enable-secret-rotation type: bool short-summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon. @@ -809,7 +809,7 @@ You must set or not set --gmsa-dns-server and --gmsa-root-domain-name at the same time when setting --enable-windows-gmsa. - name: --enable-oidc-issuer type: bool - short-summary: (PREVIEW) Enable OIDC issuer. + short-summary: Enable OIDC issuer. - name: --http-proxy-config type: string short-summary: HTTP Proxy configuration for this cluster.