From d0eb29cc67914a234fa4ddd56271e9e7638d4d32 Mon Sep 17 00:00:00 2001 From: gmarek Date: Wed, 10 Aug 2016 16:04:14 +0200 Subject: [PATCH] Change the name of kubemark config file --- docs/devel/kubemark-guide.md | 6 +++--- test/kubemark/run-e2e-tests.sh | 2 +- test/kubemark/stop-kubemark.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/devel/kubemark-guide.md b/docs/devel/kubemark-guide.md index 79bf5f07c48..8c18b2be63c 100755 --- a/docs/devel/kubemark-guide.md +++ b/docs/devel/kubemark-guide.md @@ -94,7 +94,7 @@ implementation of Hollow components/mocks will probably be lagging behind ‘rea one. For performance tests interesting variables are `NUM_NODES` and `MASTER_SIZE`. After start-kubemark script is finished you’ll have a ready Kubemark cluster, a kubeconfig file for talking to the Kubemark cluster is -stored in `test/kubemark/kubeconfig.loc`. +stored in `test/kubemark/kubeconfig.kubemark`. Currently we're running HollowNode with limit of 0.05 a CPU core and ~60MB or memory, which taking into account default cluster addons and fluentD running on @@ -115,7 +115,7 @@ to the Docker repository (*GCR for us, using scripts from `cluster/gce/util.sh` - it may get tricky outside of GCE*) - Generates certificates and kubeconfig files, writes a kubeconfig locally to -`test/kubemark/kubeconfig.loc` and creates a Secret which stores kubeconfig for +`test/kubemark/kubeconfig.kubemark` and creates a Secret which stores kubeconfig for HollowKubelet/HollowProxy use (*used gcloud to transfer files to Master, should be easy to do outside of GCE*). @@ -190,7 +190,7 @@ E.g. you want to see the logs of HollowKubelet on which pod `my-pod` is running. To do so you can execute: ``` -$ kubectl kubernetes/test/kubemark/kubeconfig.loc describe pod my-pod +$ kubectl kubernetes/test/kubemark/kubeconfig.kubemark describe pod my-pod ``` Which outputs pod description and among it a line: diff --git a/test/kubemark/run-e2e-tests.sh b/test/kubemark/run-e2e-tests.sh index bae28d988e6..3417f12ec8e 100755 --- a/test/kubemark/run-e2e-tests.sh +++ b/test/kubemark/run-e2e-tests.sh @@ -30,7 +30,7 @@ echo "Kubemark master name: ${MASTER_NAME}" detect-master export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}" -export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.loc" +export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark" export E2E_MIN_STARTUP_PODS=0 if [[ -z "$@" ]]; then diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh index 6fdff4a2f24..2a787e0e92f 100755 --- a/test/kubemark/stop-kubemark.sh +++ b/test/kubemark/stop-kubemark.sh @@ -49,7 +49,7 @@ if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then ${GCLOUD_COMMON_ARGS} || true fi -rm -rf "${RESOURCE_DIRECTORY}/addons" "${RESOURCE_DIRECTORY}/kubeconfig.loc" &> /dev/null || true +rm -rf "${RESOURCE_DIRECTORY}/addons" "${RESOURCE_DIRECTORY}/kubeconfig.kubemark" &> /dev/null || true rm "${RESOURCE_DIRECTORY}/ca.crt" \ "${RESOURCE_DIRECTORY}/kubecfg.crt" \ "${RESOURCE_DIRECTORY}/kubecfg.key" \