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

Merge pull request #14185 from tmrts/formatting 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-09-18 15:16:00 -07:00
parent e07eb387bb cb5f921df1
commit cad5f03311
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
View File

@ -16,4 +16,4 @@
export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"} export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"}
echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL} echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
/kibana-4.0.2-linux-x64/bin/kibana -e ${ELASTICSEARCH_URL} /kibana-4.0.2-linux-x64/bin/kibana -e ${ELASTICSEARCH_URL}

2
cluster/centos/node/scripts/flannel.sh
View File

@ -63,4 +63,4 @@ while true; do
done done
wait wait
systemctl daemon-reload systemctl daemon-reload

2
cluster/centos/node/scripts/kubelet.sh
View File

@ -72,4 +72,4 @@ EOF
systemctl daemon-reload systemctl daemon-reload
systemctl enable kubelet systemctl enable kubelet
systemctl start kubelet systemctl start kubelet

2
cluster/centos/node/scripts/proxy.sh
View File

@ -48,4 +48,4 @@ EOF
systemctl daemon-reload systemctl daemon-reload
systemctl enable kube-proxy systemctl enable kube-proxy
systemctl start kube-proxy systemctl start kube-proxy

2
cluster/test-network.sh
View File

@ -27,4 +27,4 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_CONFIG_FILE="config-default.sh" KUBE_CONFIG_FILE="config-default.sh"
${KUBE_ROOT}/hack/ginkgo-e2e.sh --ginkgo.focus=Networking ${KUBE_ROOT}/hack/ginkgo-e2e.sh --ginkgo.focus=Networking

2
cluster/ubuntu/config-test.sh
View File

@ -16,4 +16,4 @@
## Contains configuration values for interacting with the Ubuntu cluster in test mode ## Contains configuration values for interacting with the Ubuntu cluster in test mode
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/ubuntu/config-default.sh" source "${KUBE_ROOT}/cluster/ubuntu/config-default.sh"

2
hack/verify-all.sh
View File

@ -79,4 +79,4 @@ do
else else
python "$t" || true python "$t" || true
fi fi
done done

2
test/images/volumes-tester/iscsi/run_iscsid.sh
View File

@ -38,4 +38,4 @@ start
while true; do while true; do
sleep 5 sleep 5
done done

2
test/images/volumes-tester/rbd/bootstrap.sh
View File

@ -44,4 +44,4 @@ echo "Ceph is ready"
# Wait forever # Wait forever
while true; do while true; do
sleep 10 sleep 10
done done