From 6bfc7c4fd1fc482a34c8de08c1046b1539d356af Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 26 Apr 2019 22:49:04 -0400 Subject: [PATCH 1/3] Switch from preview to GA API version --- src/command_modules/azure-cli-acs/HISTORY.rst | 4 ++++ .../cli/command_modules/acs/_client_factory.py | 2 +- .../azure/cli/command_modules/acs/_help.py | 14 +++++++------- .../azure/cli/command_modules/acs/custom.py | 16 ++++++++-------- src/command_modules/azure-cli-acs/setup.py | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/command_modules/azure-cli-acs/HISTORY.rst b/src/command_modules/azure-cli-acs/HISTORY.rst index 0c1f58e8575..f7aa5d9ebbf 100644 --- a/src/command_modules/azure-cli-acs/HISTORY.rst +++ b/src/command_modules/azure-cli-acs/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +2.4.1 +++++++ +* Using Azure RedHat Openshift GA API Version + 2.4.0 ++++++ * BREAKING CHANGE: Removing `--fqdn` flag on az openshift commands diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_client_factory.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_client_factory.py index 9d0330d625d..2f9a8927bb0 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_client_factory.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_client_factory.py @@ -53,7 +53,7 @@ def get_container_service_client(cli_ctx, **_): def get_osa_container_service_client(cli_ctx, **_): from azure.mgmt.containerservice import ContainerServiceClient - return get_mgmt_service_client(cli_ctx, ContainerServiceClient) + return get_mgmt_service_client(cli_ctx, ContainerServiceClient, api_version='2019-04-30') def get_graph_rbac_management_client(cli_ctx, **_): diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py index 72ebbd1eedc..000200914fa 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py @@ -628,12 +628,12 @@ helps['openshift'] = """ type: group -short-summary: (PREVIEW) Manage Azure OpenShift Services. +short-summary: Manage Azure RedHat OpenShift Services. """ helps['openshift create'] = """ type: command -short-summary: (PREVIEW) Create a new managed OpenShift cluster. +short-summary: Create a new managed OpenShift cluster. parameters: - name: --compute-vm-size -s type: string @@ -677,7 +677,7 @@ helps['openshift delete'] = """ type: command -short-summary: (PREVIEW) Delete a managed OpenShift cluster. +short-summary: Delete a managed OpenShift cluster. examples: - name: Delete a managed OpenShift cluster. (autogenerated) text: az openshift delete --name MyManagedOpenShiftCluster --resource-group MyResourceGroup @@ -686,12 +686,12 @@ helps['openshift list'] = """ type: command -short-summary: (PREVIEW) List managed OpenShift clusters. +short-summary: List managed OpenShift clusters. """ helps['openshift scale'] = """ type: command -short-summary: (PREVIEW) Scale the compute pool in a managed OpenShift cluster. +short-summary: Scale the compute pool in a managed OpenShift cluster. parameters: - name: --compute-count -c type: int @@ -704,7 +704,7 @@ helps['openshift show'] = """ type: command -short-summary: (PREVIEW) Show the details for a managed OpenShift cluster. +short-summary: Show the details for a managed OpenShift cluster. examples: - name: Show the details for a managed OpenShift cluster. (autogenerated) text: az openshift show --name MyManagedOpenShiftCluster --resource-group MyResourceGroup @@ -713,7 +713,7 @@ helps['openshift wait'] = """ type: command -short-summary: (PREVIEW) Wait for a managed OpenShift cluster to reach a desired state. +short-summary: Wait for a managed OpenShift cluster to reach a desired state. long-summary: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete. examples: - name: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes. diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py index ffba583b644..b14dde02984 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py @@ -60,14 +60,14 @@ from azure.mgmt.containerservice.v2018_03_31.models import ManagedClusterAADProfile from azure.mgmt.containerservice.v2018_03_31.models import ManagedClusterAddonProfile from azure.mgmt.containerservice.v2018_03_31.models import ManagedClusterAgentPoolProfile -from azure.mgmt.containerservice.models import OpenShiftManagedClusterAgentPoolProfile -from azure.mgmt.containerservice.models import OpenShiftAgentPoolProfileRole -from azure.mgmt.containerservice.models import OpenShiftManagedClusterIdentityProvider -from azure.mgmt.containerservice.models import OpenShiftManagedClusterAADIdentityProvider -from azure.mgmt.containerservice.models import OpenShiftManagedCluster -from azure.mgmt.containerservice.models import OpenShiftRouterProfile -from azure.mgmt.containerservice.models import OpenShiftManagedClusterAuthProfile -from azure.mgmt.containerservice.models import NetworkProfile +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAgentPoolProfile +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftAgentPoolProfileRole +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterIdentityProvider +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAADIdentityProvider +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedCluster +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftRouterProfile +from azure.mgmt.containerservice.v2019_04_30.models import OpenShiftManagedClusterAuthProfile +from azure.mgmt.containerservice.v2019_04_30.models import NetworkProfile from ._client_factory import cf_container_services from ._client_factory import cf_resource_groups from ._client_factory import get_auth_management_client diff --git a/src/command_modules/azure-cli-acs/setup.py b/src/command_modules/azure-cli-acs/setup.py index 7633041606d..1172e0842d3 100644 --- a/src/command_modules/azure-cli-acs/setup.py +++ b/src/command_modules/azure-cli-acs/setup.py @@ -14,7 +14,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "2.4.0" +VERSION = "2.4.1" CLASSIFIERS = [ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', From b85b719b0f5b702596a7403390ee5e1ae645f54b Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Sun, 28 Apr 2019 22:13:44 -0400 Subject: [PATCH 2/3] s/RedHat/Red Hat --- src/command_modules/azure-cli-acs/HISTORY.rst | 2 +- .../azure-cli-acs/azure/cli/command_modules/acs/_help.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/command_modules/azure-cli-acs/HISTORY.rst b/src/command_modules/azure-cli-acs/HISTORY.rst index f7aa5d9ebbf..d31637c4820 100644 --- a/src/command_modules/azure-cli-acs/HISTORY.rst +++ b/src/command_modules/azure-cli-acs/HISTORY.rst @@ -4,7 +4,7 @@ Release History =============== 2.4.1 ++++++ -* Using Azure RedHat Openshift GA API Version +* Using Azure Red Hat Openshift GA API Version 2.4.0 ++++++ diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py index 000200914fa..4c85d872796 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_help.py @@ -628,7 +628,7 @@ helps['openshift'] = """ type: group -short-summary: Manage Azure RedHat OpenShift Services. +short-summary: Manage Azure Red Hat OpenShift Services. """ helps['openshift create'] = """ From 57b7b8382e8226e534886c0fe0cc0365ced3c707 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 30 Apr 2019 13:19:30 -0400 Subject: [PATCH 3/3] Using azure-mgmt-containerservice==5.2.0 --- src/command_modules/azure-cli-acs/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command_modules/azure-cli-acs/setup.py b/src/command_modules/azure-cli-acs/setup.py index 1172e0842d3..738d3d52504 100644 --- a/src/command_modules/azure-cli-acs/setup.py +++ b/src/command_modules/azure-cli-acs/setup.py @@ -31,7 +31,7 @@ DEPENDENCIES = [ 'azure-mgmt-authorization==0.50.0', - 'azure-mgmt-containerservice==5.1.0', + 'azure-mgmt-containerservice==5.2.0', 'azure-mgmt-compute==4.6.1', 'azure-graphrbac==0.60.0', 'azure-cli-core',