[ACS] add v3 deprecation warnings (#15802)

This commit is contained in:
Jim Minter 2020-11-09 04:22:17 -06:00 коммит произвёл GitHub
Родитель cd1dee679f
Коммит bd5496782a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 33 добавлений и 15 удалений

Просмотреть файл

@ -903,12 +903,14 @@ helps['aks rotate-certs'] = """
helps['openshift'] = """
type: group
short-summary: Manage Azure Red Hat OpenShift Services.
short-summary: Manage Azure Red Hat OpenShift 3.11 clusters.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
"""
helps['openshift create'] = """
type: command
short-summary: Create a new managed OpenShift cluster.
short-summary: Create a new Azure Red Hat OpenShift 3.11 cluster.
long-summary: Support for the creation of ARO 3.11 clusters ends 30 Nov 2020. Please see aka.ms/aro/4 for information on switching to ARO 4.
parameters:
- name: --compute-vm-size -s
type: string
@ -957,44 +959,48 @@ examples:
helps['openshift delete'] = """
type: command
short-summary: Delete a managed OpenShift cluster.
short-summary: Delete an Azure Red Hat OpenShift 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Delete a managed OpenShift cluster. (autogenerated)
- name: Delete an Azure Red Hat OpenShift 3.11 cluster.
text: az openshift delete --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
crafted: true
"""
helps['openshift list'] = """
type: command
short-summary: List managed OpenShift clusters.
short-summary: List Azure Red Hat OpenShift 3.11 clusters.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
"""
helps['openshift scale'] = """
type: command
short-summary: Scale the compute pool in a managed OpenShift cluster.
short-summary: Scale the compute pool in an Azure Red Hat OpenShift 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
parameters:
- name: --compute-count -c
type: int
short-summary: Number of nodes in the OpenShift compute pool.
examples:
- name: Scale the compute pool in a managed OpenShift cluster. (autogenerated)
- name: Scale the compute pool in an Azure Red Hat OpenShift 3.11 cluster.
text: az openshift scale --compute-count 5 --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
crafted: true
"""
helps['openshift show'] = """
type: command
short-summary: Show the details for a managed OpenShift cluster.
short-summary: Show the details for an Azure Red Hat OpenShift 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Show the details for a managed OpenShift cluster. (autogenerated)
- name: Show the details for an Azure Red Hat OpenShift 3.11 cluster.
text: az openshift show --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
crafted: true
"""
helps['openshift wait'] = """
type: command
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.
short-summary: Wait for an Azure Red Hat OpenShift 3.11 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. Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
text: |-
@ -1003,21 +1009,24 @@ examples:
helps['openshift monitor'] = """
type: group
short-summary: Commands to manage Log Analytics monitoring. Requires "--workspace-id".
short-summary: Commands to manage Log Analytics monitoring in an ARO 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
"""
helps['openshift monitor enable'] = """
type: command
short-summary: Enable Log Analytics monitoring. Requires "--workspace-id".
short-summary: Enable Log Analytics monitoring in an ARO 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Enable Log Analytics in a managed OpenShift cluster.
- name: Enable Log Analytics monitoring.
text: |-
az openshift monitor enable -g MyResourceGroup -n MyManagedCluster --workspace-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.OperationalInsights/workspaces/{workspace-id}"
"""
helps['openshift monitor disable'] = """
type: command
short-summary: Disable Log Analytics monitoring.
short-summary: Disable Log Analytics monitoring in an ARO 3.11 cluster.
long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Disable Log Analytics monitoring.
text: |-

Просмотреть файл

@ -3454,6 +3454,7 @@ def openshift_create(cmd, client, resource_group_name, name, # pylint: disable=
no_wait=False,
workspace_id=None,
customer_admin_group_id=None):
logger.warning('Support for the creation of ARO 3.11 clusters ends 30 Nov 2020. Please see aka.ms/aro/4 for information on switching to ARO 4.') # pylint: disable=line-too-long
if location is None:
location = _get_rg_location(cmd.cli_ctx, resource_group_name)
@ -3560,11 +3561,15 @@ def openshift_create(cmd, client, resource_group_name, name, # pylint: disable=
def openshift_show(cmd, client, resource_group_name, name):
logger.warning('Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.') # pylint: disable=line-too-long
mc = client.get(resource_group_name, name)
return _remove_osa_nulls([mc])[0]
def openshift_scale(cmd, client, resource_group_name, name, compute_count, no_wait=False):
logger.warning('Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.') # pylint: disable=line-too-long
instance = client.get(resource_group_name, name)
# TODO: change this approach when we support multiple agent pools.
idx = 0
@ -3583,6 +3588,8 @@ def openshift_scale(cmd, client, resource_group_name, name, compute_count, no_wa
def openshift_monitor_enable(cmd, client, resource_group_name, name, workspace_id, no_wait=False):
logger.warning('Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.') # pylint: disable=line-too-long
instance = client.get(resource_group_name, name)
workspace_id = _format_workspace_id(workspace_id)
monitor_profile = OpenShiftManagedClusterMonitorProfile(enabled=True, workspace_resource_id=workspace_id) # pylint: disable=line-too-long
@ -3592,6 +3599,8 @@ def openshift_monitor_enable(cmd, client, resource_group_name, name, workspace_i
def openshift_monitor_disable(cmd, client, resource_group_name, name, no_wait=False):
logger.warning('Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.') # pylint: disable=line-too-long
instance = client.get(resource_group_name, name)
monitor_profile = OpenShiftManagedClusterMonitorProfile(enabled=False, workspace_resource_id=None) # pylint: disable=line-too-long
instance.monitor_profile = monitor_profile