github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30364 from gmarek/master

Browse Source 
Change the name of kubemark config file
This commit is contained in:
Marek Grabowski 2016-08-10 16:05:51 +02:00 committed by GitHub
commit 8faa588ab8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/devel/kubemark-guide.md
View File

@ -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 one. For performance tests interesting variables are `NUM_NODES` and
`MASTER_SIZE`. After start-kubemark script is finished you’ll have a ready `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 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 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 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*) `cluster/gce/util.sh` - it may get tricky outside of GCE*)
- Generates certificates and kubeconfig files, writes a kubeconfig locally to - 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 HollowKubelet/HollowProxy use (*used gcloud to transfer files to Master, should
be easy to do outside of GCE*). 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: 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: Which outputs pod description and among it a line:

2
test/kubemark/run-e2e-tests.sh
View File

@ -30,7 +30,7 @@ echo "Kubemark master name: ${MASTER_NAME}"
detect-master detect-master
export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}" 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 export E2E_MIN_STARTUP_PODS=0
if [[ -z "$@" ]]; then if [[ -z "$@" ]]; then

2
test/kubemark/stop-kubemark.sh
View File

@ -49,7 +49,7 @@ if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
${GCLOUD_COMMON_ARGS} || true ${GCLOUD_COMMON_ARGS} || true
fi 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" \ rm "${RESOURCE_DIRECTORY}/ca.crt" \
"${RESOURCE_DIRECTORY}/kubecfg.crt" \ "${RESOURCE_DIRECTORY}/kubecfg.crt" \
"${RESOURCE_DIRECTORY}/kubecfg.key" \ "${RESOURCE_DIRECTORY}/kubecfg.key" \