Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions src/azure-cli/azure/cli/command_modules/acs/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@
helps['openshift'] = """
type: group
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
"""

helps['openshift create'] = """
Expand Down Expand Up @@ -1020,7 +1020,7 @@
helps['openshift delete'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Delete an Azure Red Hat OpenShift 3.11 cluster.
text: az openshift delete --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
Expand All @@ -1030,13 +1030,13 @@
helps['openshift list'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
"""

helps['openshift scale'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
parameters:
- name: --compute-count -c
type: int
Expand All @@ -1060,7 +1060,7 @@
helps['openshift wait'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://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: |-
Expand All @@ -1070,13 +1070,13 @@
helps['openshift monitor'] = """
type: group
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
"""

helps['openshift monitor enable'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Enable Log Analytics monitoring.
text: |-
Expand All @@ -1086,7 +1086,7 @@
helps['openshift monitor disable'] = """
type: command
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.
long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
examples:
- name: Disable Log Analytics monitoring.
text: |-
Expand Down
3 changes: 2 additions & 1 deletion src/azure-cli/azure/cli/command_modules/acs/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ def load_command_table(self, _):

# OSA commands
with self.command_group('openshift', openshift_managed_clusters_sdk,
client_factory=cf_openshift_managed_clusters) as g:
client_factory=cf_openshift_managed_clusters,
deprecate_info=self.deprecate(redirect='aro', hide=True)) as g:
g.custom_command('create', 'openshift_create', supports_no_wait=True)
g.command('delete', 'delete', supports_no_wait=True, confirmation=True)
g.custom_command('scale', 'openshift_scale', supports_no_wait=True)
Expand Down
8 changes: 4 additions & 4 deletions src/azure-cli/azure/cli/command_modules/acs/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -3963,14 +3963,14 @@ 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
logger.warning('The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://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
logger.warning('The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://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.
Expand All @@ -3990,7 +3990,7 @@ 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
logger.warning('The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://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)
Expand All @@ -4001,7 +4001,7 @@ 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
logger.warning('The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://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
Expand Down