diff --git a/global_hub/global_hub_import_hub_default.adoc b/global_hub/global_hub_import_hub_default.adoc index 75d1f77cee..bbe42e9b8f 100644 --- a/global_hub/global_hub_import_hub_default.adoc +++ b/global_hub/global_hub_import_hub_default.adoc @@ -1,14 +1,19 @@ [#global-hub-importing-managed-hub-in-default-mode] = Importing a managed hub cluster in the default mode -To import an existing hub cluster as a managed hub cluster, complete the following steps: +[#global-hub-importing-prereq] +== Prerequisites + +- Disable the cluster self-management in the existing {acm} hub cluster by setting the `disableHubSelfManagement` setting to `true` in the `multiclusterhub` custom resource. -. Disable the cluster self-management in the existing {acm} hub cluster by setting the `disableHubSelfManagement` setting to `true` in the `multiclusterhub` custom resource. This setting disables the automatic importing of the hub cluster as a managed cluster. +To import an existing hub cluster as a managed hub cluster, complete the following steps: -. Import the managed hub cluster by completing the steps in link:../clusters/cluster_lifecycle/import_intro.adoc#import-intro[Cluster import introduction]. +. Import the managed hub cluster by completing the steps in link:../clusters/cluster_lifecycle/import_intro.adoc#import-intro[Cluster import introduction]. You must set the label `global-hub.open-cluster-management.io/deploy-mode=default` to the managedcluster when you import it. . After the managed hub cluster is imported, check the {global-hub} agent status to ensure that the agent is running in the managed hub cluster by running the following command: + ---- -oc get managedclusteraddon multicluster-global-hub-controller -n $ ----- \ No newline at end of file +oc get managedclusteraddon multicluster-global-hub-controller -n +---- + +Note: If you try to upgrade the Globalhub from 1.4.x, you must manually add the label `global-hub.open-cluster-management.io/deploy-mode=default` to all managed hub clusters. diff --git a/global_hub/global_hub_import_hub_hosted.adoc b/global_hub/global_hub_import_hub_hosted.adoc index 794d595ba9..910f83be08 100644 --- a/global_hub/global_hub_import_hub_hosted.adoc +++ b/global_hub/global_hub_import_hub_hosted.adoc @@ -12,9 +12,8 @@ To enable `local-cluster` on your managed hub cluster, you must import it in the [#global-hub-importing-hosted-mode] == Importing a hub cluster in the hosted mode -To import an existing managed hub cluster that has `local-cluster` enabled, you must use the hosted mode. In the hosted mode, you only get support for imported managed hub clusters that use a `kubeconfig` file. {acm} uses this `kubeconfig` file to generate the `auto-import-secret`, which connects to your managed hub cluster. - *Notes:* +To import an existing managed hub cluster in hosted mode, you only get support for imported managed hub clusters that use a `kubeconfig` file. {acm} uses this `kubeconfig` file to generate the `auto-import-secret`, which connects to your managed hub cluster. - Make sure this `kubeconfig` file is always usable. If it expires, regenerate the `auto-import-secret` in the managed hub cluster namespace with the following command: + @@ -26,12 +25,10 @@ oc create secret generic auto-import-secret --from-file=kubeconfig=./managedClus Complete the following steps: -. Set the annotation `global-hub.open-cluster-management.io/import-cluster-in-hosted: "true"` to `globalhub cr`. -. Import your managed hub cluster. - -With this annotation, {global-hub} does the following actions: - -- Imports all the new managed hub clusters in hosted mode. -- Disables the following `addons` in the new managed hub clusters namespaces: `applicationManager`, `certPolicyController`, and `policyController`. -- Changes the following managed hub clusters `addons` that are related to the new namespace: `work-manager`,`cluster-proxy`, and `managed-serviceaccount`. -- Changes these namespaces to `open-cluster-management-global-hub-agent-addon`. \ No newline at end of file +. Import your managed hub cluster By setting label `global-hub.open-cluster-management.io/deploy-mode=hosted` to managedcluster + With this label, {global-hub} does the following actions: + - Imports the new managed hub cluster in hosted mode. + - Install Globalhub Agent in the new managed hub cluster using hosted mode. + - Disables the following `addons` in the new managed hub clusters namespaces: `applicationManager`, `certPolicyController`, and `policyController`. + - Changes the following managed hub clusters `addons` that are related to the new namespace: `work-manager`,`cluster-proxy`, and `managed-serviceaccount`. + - Changes these namespaces to `open-cluster-management-global-hub-agent-addon`.