github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Add a new network for e2e tests, to isolate it from any other cluster.

Browse Source
This commit is contained in:
Brendan Burns 2014-09-24 16:03:38 -07:00
parent 65c14a1b09
commit 511ec280b9
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ MINION_SIZE=g1-small
NUM_MINIONS=2 NUM_MINIONS=2
# gcloud/gcutil will expand this to the latest supported image. # gcloud/gcutil will expand this to the latest supported image.
IMAGE=backports-debian-7-wheezy IMAGE=backports-debian-7-wheezy
NETWORK=default NETWORK=e2e
INSTANCE_PREFIX="e2e-test-${USER}" INSTANCE_PREFIX="e2e-test-${USER}"
MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_NAME="${INSTANCE_PREFIX}-master"
MASTER_TAG="${INSTANCE_PREFIX}-master" MASTER_TAG="${INSTANCE_PREFIX}-master"

17
cluster/gce/util.sh
View File

@ -149,6 +149,23 @@ function kube-up {
grep -v "^#" $(dirname $0)/templates/salt-master.sh grep -v "^#" $(dirname $0)/templates/salt-master.sh
) > ${KUBE_TEMP}/master-start.sh ) > ${KUBE_TEMP}/master-start.sh
if ! gcutil getnetwork "${NETWORK}"; then
echo "Creating new network for: ${NETWORK}"
gcutil addnetwork "${NETWORK}" --range "10.240.0.0/16"
gcutil addfirewall "${NETWORK}-default-internal" \
--norespect_terminal_width \
--project "${PROJECT}" \
--network "${NETWORK}" \
--allowed_ip_sources "10.0.0.0/8" \
--allowed "tcp:1-65535,udp:1-65535,icmp" &
gcutil addfirewall "${NETWORK}-default-ssh" \
--norespect_terminal_width \
--project "${PROJECT}" \
--network "${NETWORK}" \
--allowed_ip_sources "0.0.0.0/0" \
--allowed "tcp:22" &
fi
echo "Starting VMs and configuring firewalls" echo "Starting VMs and configuring firewalls"
gcutil addfirewall ${MASTER_NAME}-https \ gcutil addfirewall ${MASTER_NAME}-https \
--norespect_terminal_width \ --norespect_terminal_width \

8
hack/e2e-suite/update.sh
View File

@ -31,6 +31,14 @@ function validate() {
NUM_REPLICAS=$1 NUM_REPLICAS=$1
CONTAINER_IMAGE_VERSION=$2 CONTAINER_IMAGE_VERSION=$2
POD_ID_LIST=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' -l simpleService=${CONTROLLER_NAME} list pods) POD_ID_LIST=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' -l simpleService=${CONTROLLER_NAME} list pods)
POD_ARR=($POD_ID_LIST)
while [ ${#POD_ARR[@]} -ne $NUM_REPLICAS ]; do
echo "Waiting for the right number of containers"
sleep 5
POD_ID_LIST=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' -l simpleService=${CONTROLLER_NAME} list pods)
POD_ARR=($POD_ID_LIST)
done
# Container turn up on a clean cluster can take a while for the docker image pull. # Container turn up on a clean cluster can take a while for the docker image pull.
ALL_RUNNING=0 ALL_RUNNING=0
while [ $ALL_RUNNING -ne 1 ]; do while [ $ALL_RUNNING -ne 1 ]; do

10
hack/e2e-test.sh
View File

@ -17,6 +17,11 @@
# Starts a Kubernetes cluster, runs the e2e test suite, and shuts it # Starts a Kubernetes cluster, runs the e2e test suite, and shuts it
# down. # down.
# Use testing config
export KUBE_CONFIG_FILE="config-test.sh"
export KUBE_REPO_ROOT="$(dirname $0)/.."
export KUBECFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
source $(dirname $0)/../cluster/kube-env.sh source $(dirname $0)/../cluster/kube-env.sh
source $(dirname $0)/../cluster/$KUBERNETES_PROVIDER/util.sh source $(dirname $0)/../cluster/$KUBERNETES_PROVIDER/util.sh
@ -29,11 +34,6 @@ TEAR_DOWN=${3:-0}
# Exit on error # Exit on error
set -e set -e
# Use testing config
export KUBE_CONFIG_FILE="config-test.sh"
export KUBE_REPO_ROOT="$(dirname $0)/.."
export KUBECFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
if [[ $TEAR_DOWN -ne 0 ]]; then if [[ $TEAR_DOWN -ne 0 ]]; then
detect-project detect-project
trap test-teardown EXIT trap test-teardown EXIT