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

fix typo for cluster/*

pull/6/head
Aaron.L.Xu 2016-12-20 04:56:45 -08:00
parent 2b0a1f2b11
commit b3b9bcc04c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/images/etcd/rollback/rollback.go
View File

@ -325,7 +325,8 @@ func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) {
applyV2.Put(r) applyV2.Put(r)
case "DELETE": case "DELETE":
applyV2.Delete(r) applyV2.Delete(r)
case "POST", "QGET", "SYNC": //case "POST", "QGET", "SYNC":
case "POST", "GET", "SYNC":
return return
default: default:
glog.Fatal("unknown command") glog.Fatal("unknown command")

6
cluster/ubuntu/util.sh
View File

@ -71,7 +71,7 @@ function setClusterInfo() {
# Sanity check on $CNI_PLUGIN_CONF and $CNI_PLUGIN_EXES # Sanity check on $CNI_PLUGIN_CONF and $CNI_PLUGIN_EXES
function check-CNI-config() { function check-CNI-config() {
if [ -z "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then if [ -z "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then
echo "Warning: CNI_PLUGIN_CONF is emtpy but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2 echo "Warning: CNI_PLUGIN_CONF is empty but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2
elif [ -n "$CNI_PLUGIN_CONF" ] && [ -z "$CNI_PLUGIN_EXES" ]; then elif [ -n "$CNI_PLUGIN_CONF" ] && [ -z "$CNI_PLUGIN_EXES" ]; then
echo "Warning: CNI_PLUGIN_EXES is empty but CNI_PLUGIN_CONF is not (it is $CNI_PLUGIN_CONF); Flannel will be used" & 2 echo "Warning: CNI_PLUGIN_EXES is empty but CNI_PLUGIN_CONF is not (it is $CNI_PLUGIN_CONF); Flannel will be used" & 2
elif [ -n "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then elif [ -n "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then
@ -545,7 +545,7 @@ function provision-node() {
BASH_DEBUG_FLAGS="set -x" BASH_DEBUG_FLAGS="set -x"
fi fi
# remote login to node and configue k8s node # remote login to node and configure k8s node
ssh $SSH_OPTS -t "$1" " ssh $SSH_OPTS -t "$1" "
set +e set +e
${BASH_DEBUG_FLAGS} ${BASH_DEBUG_FLAGS}
@ -638,7 +638,7 @@ function provision-masterandnode() {
BASH_DEBUG_FLAGS="set -x" BASH_DEBUG_FLAGS="set -x"
fi fi
# remote login to the master/node and configue k8s # remote login to the master/node and configure k8s
ssh $SSH_OPTS -t "$MASTER" " ssh $SSH_OPTS -t "$MASTER" "
set +e set +e
${BASH_DEBUG_FLAGS} ${BASH_DEBUG_FLAGS}