Merge pull request #2621 from RainbowMango/automated-cherry-pick-of-#2608-upstream-release-1.3

Automated cherry pick of #2608: Modify the wrong noun for karmadactl

Author: karmada-bot

hack/post-run-e2e.sh

@@ -33,7 +33,7 @@ kubectl apply -f - -n kube-system
 kubectl config use-context "${KARMADA_APISERVER}"
 kubectl delete ResourceInterpreterWebhookConfiguration examples
 
-# delete interpreter example workload CRD in karamada-apiserver and member clusters
+# delete interpreter example workload CRD in karmada-apiserver and member clusters
 kubectl delete -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml"
 export KUBECONFIG="${MEMBER_CLUSTER_KUBECONFIG}"
 kubectl config use-context "${MEMBER_CLUSTER_1_NAME}"

hack/pre-run-e2e.sh

@@ -71,7 +71,7 @@ sed -i'' -e "s/{{karmada-interpreter-webhook-example-svc-address}}/${interpreter
 util::deploy_webhook_configuration "${ROOT_CA_FILE}" "${REPO_ROOT}/examples/customresourceinterpreter/webhook-configuration-temp.yaml"
 rm -rf "${REPO_ROOT}/examples/customresourceinterpreter/webhook-configuration-temp.yaml"
 
-# install interpreter example workload CRD in karamada-apiserver and member clusters
+# install interpreter example workload CRD in karmada-apiserver and member clusters
 kubectl apply -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml"
 export KUBECONFIG="${MEMBER_CLUSTER_KUBECONFIG}"
 kubectl config use-context "${MEMBER_CLUSTER_1_NAME}"

pkg/karmadactl/join.go

@@ -23,7 +23,7 @@ var (
 	joinLong  = `Join registers a cluster to control plane.`
 
 	joinExample = templates.Examples(`
-		# Join cluster into karamada control plane, if '--cluster-context' not specified, take the cluster name as the context
+		# Join cluster into karmada control plane, if '--cluster-context' not specified, take the cluster name as the context
 		%[1]s join CLUSTER_NAME --cluster-kubeconfig=<KUBECONFIG>`)
 )
 

pkg/karmadactl/register.go

@@ -49,7 +49,7 @@ var (
 	registerLong  = `Register a cluster to Karmada control plane with PULL mode.`
 
 	registerExample = templates.Examples(`
-		# Register cluster into karamada control plane with PULL mode.
+		# Register cluster into karmada control plane with PULL mode.
 		# If '--cluster-name' isn't specified, the cluster of current-context will be used by default.
 		%[1]s register [karmada-apiserver-endpoint] --cluster-name=<CLUSTER_NAME> --token=<TOKEN>  --discovery-token-ca-cert-hash=<CA-CERT-HASH>
 		

pkg/karmadactl/unjoin.go

@@ -25,13 +25,13 @@ var (
 	unjoinShort   = `Remove the registration of a cluster from control plane`
 	unjoinLong    = `Unjoin removes the registration of a cluster from control plane.`
 	unjoinExample = templates.Examples(`
-		# Unjoin cluster from karamada control plane, but not to remove resources created by karmada in the unjoining cluster
+		# Unjoin cluster from karmada control plane, but not to remove resources created by karmada in the unjoining cluster
 		%[1]s unjoin CLUSTER_NAME
 	
-		# Unjoin cluster from karamada control plane and attempt to remove resources created by karmada in the unjoining cluster
+		# Unjoin cluster from karmada control plane and attempt to remove resources created by karmada in the unjoining cluster
 		%[1]s unjoin CLUSTER_NAME --cluster-kubeconfig=<KUBECONFIG>
 			
-		# Unjoin cluster from karamada control plane with timeout
+		# Unjoin cluster from karmada control plane with timeout
 		%[1]s unjoin CLUSTER_NAME --cluster-kubeconfig=<KUBECONFIG> --wait 2m`)
 )