Skip to content

Commit

Permalink
Merge pull request #20976 from wojtek-t/remove_annoying_logs
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Feb 11, 2016
2 parents 798b88e + 932302f commit 62e5743
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/kubemark/configure-kubectl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

curl https://sdk.cloud.google.com | bash
curl https://sdk.cloud.google.com 2> /dev/null | bash
sudo gcloud components update kubectl -q
sudo ln -s /usr/local/share/google/google-cloud-sdk/bin/kubectl /bin/
kubectl config set-cluster hollow-cluster --server=http://localhost:8080 --insecure-skip-tls-verify=true
Expand Down
2 changes: 1 addition & 1 deletion test/kubemark/start-kubemark-master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ kubernetes/server/bin/kube-apiserver \
--basic-auth-file=/srv/kubernetes/basic_auth.csv &> /var/log/kube-apiserver.log &

# kube-contoller-manager now needs running kube-api server to actually start
until [ "$(curl 127.0.0.1:8080/healthz)" == "ok" ]; do
until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do
sleep 1
done
kubernetes/server/bin/kube-controller-manager --master=127.0.0.1:8080 --service-account-private-key-file=/srv/kubernetes/server.key --root-ca-file=/srv/kubernetes/ca.crt --v=2 &> /var/log/kube-controller-manager.log &
Expand Down

0 comments on commit 62e5743

Please sign in to comment.