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

remove --api-version

pull/6/head
xilabao 2017-05-19 10:29:27 +08:00
parent 7f183142de
commit e0b4f3f73c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/libvirt-coreos/util.sh
View File

@ -215,7 +215,7 @@ function wait-cluster-readiness {
local timeout=120 local timeout=120
while [[ $timeout -ne 0 ]]; do 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" echo "Nb ready nodes: $nb_ready_nodes / $NUM_NODES"
if [[ "$nb_ready_nodes" -eq "$NUM_NODES" ]]; then if [[ "$nb_ready_nodes" -eq "$NUM_NODES" ]]; then
return 0 return 0

2
cluster/vagrant/util.sh
View File

@ -237,7 +237,7 @@ function verify-cluster {
echo "Timeout while waiting for echo node to be registered with cloud provider" echo "Timeout while waiting for echo node to be registered with cloud provider"
exit 2 exit 2
fi 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]}") || { validated=$(echo $nodes | grep -c "${NODE_NAMES[i]}") || {
printf "." printf "."
sleep 2 sleep 2

2
pkg/kubectl/cmd/explain.go
View File

@ -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().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) cmdutil.AddInclude3rdPartyFlags(cmd)
return cmd return cmd
} }