Merge pull request kubernetes#45637 from xilabao/hide-api-version

Automatic merge from submit-queue remove --api-version
leodido · May 23, 2017 · 4871f4a · 4871f4a
2 parents 8bee44b + e0b4f3f
commit 4871f4a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
@@ -215,7 +215,7 @@ function wait-cluster-readiness {
 
   local timeout=120
   while [[ $timeout -ne 0 ]]; do
-    nb_ready_nodes=$(kubectl get nodes -o go-template="{{range.items}}{{range.status.conditions}}{{.type}}{{end}}:{{end}}" --api-version=v1 2>/dev/null | tr ':' '\n' | grep -c Ready || true)
+    nb_ready_nodes=$(kubectl get nodes -o go-template="{{range.items}}{{range.status.conditions}}{{.type}}{{end}}:{{end}}" 2>/dev/null | tr ':' '\n' | grep -c Ready || true)
     echo "Nb ready nodes: $nb_ready_nodes / $NUM_NODES"
     if [[ "$nb_ready_nodes" -eq "$NUM_NODES" ]]; then
       return 0

diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
@@ -237,7 +237,7 @@ function verify-cluster {
         echo "Timeout while waiting for echo node to be registered with cloud provider"
         exit 2
       fi
-      local nodes=$("${KUBE_ROOT}/cluster/kubectl.sh" get nodes -o name --api-version=v1)
+      local nodes=$("${KUBE_ROOT}/cluster/kubectl.sh" get nodes -o name)
       validated=$(echo $nodes | grep -c "${NODE_NAMES[i]}") || {
         printf "."
         sleep 2

diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain.go
@@ -57,7 +57,7 @@ func NewCmdExplain(f cmdutil.Factory, out, cmdErr io.Writer) *cobra.Command {
 		},
 	}
 	cmd.Flags().Bool("recursive", false, "Print the fields of fields (Currently only 1 level deep)")
-	cmd.Flags().String("api-version", "", "The API version to use when talking to the server")
+	cmd.Flags().String("api-version", "", "Get different explanations for particular API version")
 	cmdutil.AddInclude3rdPartyFlags(cmd)
 	return cmd
 }