diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 06fd19e9..3ed8821a 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -64,7 +64,7 @@ jobs: echo "Running kubecm add..." echo "********************************************************************************" bin/kubecm add -cf 2nd-kind - bin/kubecm add -cf 3rd-kind --context-name 3rd + bin/kubecm add -cf 3rd-kind --context-prefix 3rd echo "********************************************************************************" echo "Running kubecm merge multiple kubeconfig..." echo "********************************************************************************" @@ -85,7 +85,7 @@ jobs: echo "********************************************************************************" echo "Running kubecm switch..." echo "********************************************************************************" - bin/kubecm s 3rd + bin/kubecm s 3rd-kind-3rd-kind echo "********************************************************************************" echo "Running kubecm delete..." echo "********************************************************************************" @@ -109,5 +109,5 @@ jobs: echo "********************************************************************************" echo "Running kubecm create..." echo "********************************************************************************" - bin/kubecm create --user e2e --namespace default --cluster-role view --context-name kind-2nd-kind + bin/kubecm create --user e2e --namespace default --cluster-role view --context kind-2nd-kind kubectl get all --kubeconfig e2e-kubeconfig.yaml \ No newline at end of file diff --git a/docs/zh-cn/cli/kubecm_add.md b/docs/zh-cn/cli/kubecm_add.md index 34e72b29..29e69129 100644 --- a/docs/zh-cn/cli/kubecm_add.md +++ b/docs/zh-cn/cli/kubecm_add.md @@ -10,10 +10,6 @@ kubecm add [flags] ``` ->注意:如果 `-c` 被设置,且添加的 kubeconfig 文件中有**超过一个** context,会出现如下情况: ->- 如果设置了 `--context-name`,则 context 会以 ``, `` 的形式产生 ->- 如果没有设置 `--context-name`,则会以 `` 的方式展示,其中 `{hash}` 是文件名的 MD5 哈希值 - ### 示例 ``` @@ -21,7 +17,7 @@ kubecm add [flags] # Merge test.yaml with $HOME/.kube/config kubecm add -f test.yaml # Merge test.yaml with $HOME/.kube/config and rename context name -kubecm add -cf test.yaml --context-name test +kubecm add -cf test.yaml --context-prefix test # Add kubeconfig from stdin cat /etc/kubernetes/admin.conf | kubecm add -f - @@ -30,7 +26,7 @@ cat /etc/kubernetes/admin.conf | kubecm add -f - ### 选项 ``` - --context-name string override context name when add kubeconfig context + --context-prefix string override context name when add kubeconfig context -c, --cover Overwrite local kubeconfig files -f, --file string Path to merge kubeconfig files