karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2608 from Fish-pro/fix-karamada 

karmadactl: modify the wrong noun for karmadactl
This commit is contained in:
karmada-bot 2022-10-05 22:46:02 +08:00 committed by GitHub
parent bcca1125de 828e2c945f
commit 75a0305a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/post-run-e2e.sh
View File

@ -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"

2
hack/pre-run-e2e.sh
View File

@ -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"

2
pkg/karmadactl/join.go
View File

@ -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>`)
)

2
pkg/karmadactl/register.go
View File

@ -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>

6
pkg/karmadactl/unjoin.go
View File

@ -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`)
)