From 6e943d7fe3ff46f6bb90a8b9c63760ce6aac1435 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Mon, 22 Sep 2025 20:29:41 -0400 Subject: [PATCH 1/4] https://issues.redhat.com/browse/ACM-21159 --- clusters/discovery/discovery_config_ui.adoc | 42 ++++++++++----------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/clusters/discovery/discovery_config_ui.adoc b/clusters/discovery/discovery_config_ui.adoc index f8f945a463..d226b52dbe 100644 --- a/clusters/discovery/discovery_config_ui.adoc +++ b/clusters/discovery/discovery_config_ui.adoc @@ -13,34 +13,32 @@ After you discover clusters, you can import clusters that appear in the _Discove * You need access to the namespaces that were used to configure Discovery. -[#import-discovered] -== Import discovered clusters from the console - -To manually import other infrastructure provider discovered clusters, complete the following steps: - -. Go to the existing _Clusters_ page and click the *Discovered clusters* tab. -. From the _Discovered clusters_ table, find the cluster that you want to import. -. From the options menu, choose *Import cluster*. -. For discovered clusters, you can import manually using the documentation, or you can choose Import clusters automatically. -. To import automatically with your credentials or Kubeconfig file, copy and paste the content. -. Click *Import*. - -[#discovery-view] -== View discovered clusters - -After you set up your credentials and discover your clusters for import, you can view them in the console. - -. Click *Clusters* > *Discovered clusters*. -. View the populated table with the following information: +. Manually import discovered clusters from the console. To import other infrastructure provider discovered clusters, complete the following steps: + +.. Go to the existing _Clusters_ page and click the *Discovered clusters* tab. +.. From the _Discovered clusters_ table, find the cluster that you want to import. +.. From the options menu, choose *Import cluster*. +.. For discovered clusters, you can import manually using the documentation, or you can choose Import clusters automatically. +.. To import automatically with your credentials or `kubeconfig` file, copy and paste the content. +.. Click *Import*. + +. View and search discovered clusters in the console after you set up your credentials. +.. Click *Clusters* > *Discovered clusters*. +.. View the populated table with the following information: - _Name_ is the display name that is designated in {ocm}. If the cluster does not have a display name, a generated name based on the cluster console URL is displayed. If the console URL is missing or was modified manually in {ocm}, the cluster external ID is displayed. - _Namespace_ is the namespace where you created the credential and discovered clusters. - - _Type_ is the discovered cluster Red Hat OpenShift type. + - _Type_ is the discovered cluster Red Hat OpenShift type. + //review this - _Distribution version_ is the discovered cluster Red Hat OpenShift version. - - _Infrastructure provider_ is the cloud provider of the discovered cluster. + //review this + - _Infrastructure provider_ is the cloud provider of the discovered cluster. + //we say this twice - _Last active_ is the last time the discovered cluster was active. - _Created_ when the discovered cluster was created. - _Discovered_ when the discovered cluster was discovered. - _Cluster types_ is the platform type of the cluster, such as {ocp-short} or {rosa}. - _Infrastructure providers_ filters by where the cluster is running, such as Amazon Web Services (AWS) or Microsoft Azure. + //second time . You can search for any information in the table, as well. For example, to show only _Discovered clusters_ in a particular namespace, search for that namespace. -. You can now click *Import cluster* to create managed clusters. +. You can view the Region from the command line tool with the following command: +. You can now click *Import cluster* to create managed clusters. \ No newline at end of file From 727fc4bea26003641826972a790dc5469aa0550a Mon Sep 17 00:00:00 2001 From: swope Date: Thu, 25 Sep 2025 13:57:56 -0400 Subject: [PATCH 2/4] Update discovery_config_ui.adoc --- clusters/discovery/discovery_config_ui.adoc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/clusters/discovery/discovery_config_ui.adoc b/clusters/discovery/discovery_config_ui.adoc index d226b52dbe..881cbc0b94 100644 --- a/clusters/discovery/discovery_config_ui.adoc +++ b/clusters/discovery/discovery_config_ui.adoc @@ -27,7 +27,7 @@ After you discover clusters, you can import clusters that appear in the _Discove .. View the populated table with the following information: - _Name_ is the display name that is designated in {ocm}. If the cluster does not have a display name, a generated name based on the cluster console URL is displayed. If the console URL is missing or was modified manually in {ocm}, the cluster external ID is displayed. - _Namespace_ is the namespace where you created the credential and discovered clusters. - - _Type_ is the discovered cluster Red Hat OpenShift type. + - _Type_ is the discovered cluster {ocp-short} platform type. //review this - _Distribution version_ is the discovered cluster Red Hat OpenShift version. //review this @@ -36,9 +36,7 @@ After you discover clusters, you can import clusters that appear in the _Discove - _Last active_ is the last time the discovered cluster was active. - _Created_ when the discovered cluster was created. - _Discovered_ when the discovered cluster was discovered. - - _Cluster types_ is the platform type of the cluster, such as {ocp-short} or {rosa}. - - _Infrastructure providers_ filters by where the cluster is running, such as Amazon Web Services (AWS) or Microsoft Azure. - //second time . You can search for any information in the table, as well. For example, to show only _Discovered clusters_ in a particular namespace, search for that namespace. . You can view the Region from the command line tool with the following command: -. You can now click *Import cluster* to create managed clusters. \ No newline at end of file +//We need to confirm this and link to CLI doc for that process, then edit CLI doc. +. You can now click *Import cluster* to create managed clusters. From e32ef4defb4c94579aee9a98a976d247d05818e6 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Mon, 3 Nov 2025 15:23:59 -0500 Subject: [PATCH 3/4] https://issues.redhat.com/browse/ACM-21159 - post-review fixes --- clusters/discovery/discovery_config_cli.adoc | 6 +++++- clusters/discovery/discovery_config_ui.adoc | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/clusters/discovery/discovery_config_cli.adoc b/clusters/discovery/discovery_config_cli.adoc index e6739d59ab..672fae3282 100644 --- a/clusters/discovery/discovery_config_cli.adoc +++ b/clusters/discovery/discovery_config_cli.adoc @@ -1,7 +1,7 @@ [#discovery-enable-cli] = Enable Discovery using the CLI -Enable discovery using the CLI to find clusters that are available from {ocm}. +Enable discovery using the CLI to find clusters that are available from {ocm}. **Required access**: Administrator @@ -39,6 +39,10 @@ spec: View discovered clusters by running `oc get discoveredclusters -n ` where `namespace` is the namespace where the discovery credential exists. +You can view the Region from the command line tool, as well. Run the following command to view the `DiscoveredCluster` region: + +//need command + Objects are created by the Discovery controller. These `DiscoveredClusters` represent the clusters that are found in {ocm} by using the filters and credentials that are specified in the `DiscoveryConfig` `discoveredclusters.discovery.open-cluster-management.io` API. The value for `name` is the cluster external ID: [source,yaml] diff --git a/clusters/discovery/discovery_config_ui.adoc b/clusters/discovery/discovery_config_ui.adoc index 881cbc0b94..106ea7b0eb 100644 --- a/clusters/discovery/discovery_config_ui.adoc +++ b/clusters/discovery/discovery_config_ui.adoc @@ -28,15 +28,10 @@ After you discover clusters, you can import clusters that appear in the _Discove - _Name_ is the display name that is designated in {ocm}. If the cluster does not have a display name, a generated name based on the cluster console URL is displayed. If the console URL is missing or was modified manually in {ocm}, the cluster external ID is displayed. - _Namespace_ is the namespace where you created the credential and discovered clusters. - _Type_ is the discovered cluster {ocp-short} platform type. - //review this - _Distribution version_ is the discovered cluster Red Hat OpenShift version. - //review this - _Infrastructure provider_ is the cloud provider of the discovered cluster. - //we say this twice - _Last active_ is the last time the discovered cluster was active. - _Created_ when the discovered cluster was created. - _Discovered_ when the discovered cluster was discovered. . You can search for any information in the table, as well. For example, to show only _Discovered clusters_ in a particular namespace, search for that namespace. -. You can view the Region from the command line tool with the following command: -//We need to confirm this and link to CLI doc for that process, then edit CLI doc. . You can now click *Import cluster* to create managed clusters. From 3c88b5e69a92c7f83cfbc37535b9c03882053746 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Mon, 10 Nov 2025 17:34:07 -0500 Subject: [PATCH 4/4] command --- clusters/discovery/discovery_config_cli.adoc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/clusters/discovery/discovery_config_cli.adoc b/clusters/discovery/discovery_config_cli.adoc index 672fae3282..dee072f6d2 100644 --- a/clusters/discovery/discovery_config_cli.adoc +++ b/clusters/discovery/discovery_config_cli.adoc @@ -37,12 +37,8 @@ spec: [#view-discovered-cluster] == View discovered clusters -View discovered clusters by running `oc get discoveredclusters -n ` where `namespace` is the namespace where the discovery credential exists. - -You can view the Region from the command line tool, as well. Run the following command to view the `DiscoveredCluster` region: - -//need command - +View discovered clusters by running `oc get discoveredclusters -n ` where `namespace` is the namespace where the discovery credential exists. You can use the same command to view the region if you have a region set. + Objects are created by the Discovery controller. These `DiscoveredClusters` represent the clusters that are found in {ocm} by using the filters and credentials that are specified in the `DiscoveryConfig` `discoveredclusters.discovery.open-cluster-management.io` API. The value for `name` is the cluster external ID: [source,yaml]