Skip to content

K
k3s
Commit 6b8c6e16 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #37221 from gmarek/master

Automatic merge from submit-queue Update start-kubemark-master to correctly work in case of master-comp… @saad-ali - test only change.
parents c9ed5262 15471488
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/kubemark/start-kubemark-master.sh
View file @ 6b8c6e16
...@@ -116,7 +116,7 @@ ulimit -n 65536 ...@@ -116,7 +116,7 @@ ulimit -n 65536
tar xzf kubernetes-server-linux-amd64.tar.gz tar xzf kubernetes-server-linux-amd64.tar.gz
kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat scheduler_flags) &> /var/log/kube-scheduler.log & kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat scheduler_flags) &>> /var/log/kube-scheduler.log &
kubernetes/server/bin/kube-apiserver \ kubernetes/server/bin/kube-apiserver \
--insecure-bind-address=0.0.0.0 \ --insecure-bind-address=0.0.0.0 \
...@@ -129,7 +129,7 @@ kubernetes/server/bin/kube-apiserver \ ...@@ -129,7 +129,7 @@ kubernetes/server/bin/kube-apiserver \
--secure-port=443 \ --secure-port=443 \
--basic-auth-file=/srv/kubernetes/basic_auth.csv \ --basic-auth-file=/srv/kubernetes/basic_auth.csv \
--target-ram-mb=$((${NUM_NODES} * 60)) \ --target-ram-mb=$((${NUM_NODES} * 60)) \
$(cat apiserver_flags) &> /var/log/kube-apiserver.log & $(cat apiserver_flags) &>> /var/log/kube-apiserver.log &
# kube-contoller-manager now needs running kube-api server to actually start # kube-contoller-manager now needs running kube-api server to actually start
until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do
...@@ -139,4 +139,4 @@ kubernetes/server/bin/kube-controller-manager \ ...@@ -139,4 +139,4 @@ kubernetes/server/bin/kube-controller-manager \
--master=127.0.0.1:8080 \ --master=127.0.0.1:8080 \
--service-account-private-key-file=/srv/kubernetes/server.key \ --service-account-private-key-file=/srv/kubernetes/server.key \
--root-ca-file=/srv/kubernetes/ca.crt \ --root-ca-file=/srv/kubernetes/ca.crt \
$(cat controllers_flags) &> /var/log/kube-controller-manager.log & $(cat controllers_flags) &>> /var/log/kube-controller-manager.log &
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment