From 828e2c945f842dcb92983ee7fbe72c6f9e5c1d2e Mon Sep 17 00:00:00 2001 From: chen zechun Date: Sun, 2 Oct 2022 22:46:55 +0800 Subject: [PATCH] Modify the wrong noun for karmadactl Signed-off-by: chen zechun --- hack/post-run-e2e.sh | 2 +- hack/pre-run-e2e.sh | 2 +- pkg/karmadactl/join.go | 2 +- pkg/karmadactl/register.go | 2 +- pkg/karmadactl/unjoin.go | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/post-run-e2e.sh b/hack/post-run-e2e.sh index b43ac05a4..ebd4cc2ae 100755 --- a/hack/post-run-e2e.sh +++ b/hack/post-run-e2e.sh @@ -29,7 +29,7 @@ kubectl --context="${HOST_CLUSTER_NAME}" apply -f - -n kube-system # delete interpreter workload webhook configuration kubectl --context="${KARMADA_APISERVER}" 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 --context="${KARMADA_APISERVER}" delete -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml" export KUBECONFIG="${MEMBER_CLUSTER_KUBECONFIG}" kubectl --context="${MEMBER_CLUSTER_1_NAME}" delete -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml" diff --git a/hack/pre-run-e2e.sh b/hack/pre-run-e2e.sh index 569b97594..084309458 100755 --- a/hack/pre-run-e2e.sh +++ b/hack/pre-run-e2e.sh @@ -75,7 +75,7 @@ sed -i'' -e "s/{{karmada-interpreter-webhook-example-svc-address}}/${interpreter util::deploy_webhook_configuration "${KARMADA_APISERVER}" "${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 --context="${KARMADA_APISERVER}" apply -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml" export KUBECONFIG="${MEMBER_CLUSTER_KUBECONFIG}" kubectl --context="${MEMBER_CLUSTER_1_NAME}" apply -f "${REPO_ROOT}/examples/customresourceinterpreter/apis/workload.example.io_workloads.yaml" diff --git a/pkg/karmadactl/join.go b/pkg/karmadactl/join.go index 39be630a3..ebcbbc46d 100644 --- a/pkg/karmadactl/join.go +++ b/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=`) ) diff --git a/pkg/karmadactl/register.go b/pkg/karmadactl/register.go index ca38d994a..873d4c6d6 100644 --- a/pkg/karmadactl/register.go +++ b/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= --token= --discovery-token-ca-cert-hash= diff --git a/pkg/karmadactl/unjoin.go b/pkg/karmadactl/unjoin.go index 0e5292fd0..a4384f0f8 100644 --- a/pkg/karmadactl/unjoin.go +++ b/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= - # Unjoin cluster from karamada control plane with timeout + # Unjoin cluster from karmada control plane with timeout %[1]s unjoin CLUSTER_NAME --cluster-kubeconfig= --wait 2m`) )