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

Merge pull request #80026 from mborsz/ha

Browse Source 
Add support for HA kubemark
This commit is contained in:
Kubernetes Prow Robot 2019-07-11 07:29:08 -07:00 committed by GitHub
commit 469b9d2f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/kubemark/gce/util.sh
View File

@ -35,11 +35,15 @@ function create-kubemark-master {
# We intentionally override env vars in subshell to preserve original values. # We intentionally override env vars in subshell to preserve original values.
# shellcheck disable=SC2030,SC2031 # shellcheck disable=SC2030,SC2031
( (
# All calls to e2e-grow-cluster must share temp dir with initial e2e-up.sh.
kube::util::ensure-temp-dir
export KUBE_TEMP="${KUBE_TEMP}"
export KUBECONFIG="${RESOURCE_DIRECTORY}/kubeconfig.kubemark" export KUBECONFIG="${RESOURCE_DIRECTORY}/kubeconfig.kubemark"
export CLUSTER_NAME="${CLUSTER_NAME}-kubemark" export CLUSTER_NAME="${CLUSTER_NAME}-kubemark"
export KUBE_CREATE_NODES=false export KUBE_CREATE_NODES=false
export KUBE_GCE_INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX}-kubemark" export KUBE_GCE_INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX}-kubemark"
# Even if the "real cluster" is private, we shouldn't manage cloud nat. # Even if the "real cluster" is private, we shouldn't manage cloud nat.
export KUBE_GCE_PRIVATE_CLUSTER=false export KUBE_GCE_PRIVATE_CLUSTER=false
@ -47,7 +51,7 @@ function create-kubemark-master {
# cloud routes and RangeAllocator to assign cidrs by kube-controller-manager. # cloud routes and RangeAllocator to assign cidrs by kube-controller-manager.
export KUBE_GCE_ENABLE_IP_ALIASES=true export KUBE_GCE_ENABLE_IP_ALIASES=true
export KUBE_GCE_NODE_IPAM_MODE=RangeAllocator export KUBE_GCE_NODE_IPAM_MODE=RangeAllocator
# Disable all addons. They are running outside of the kubemark cluster. # Disable all addons. They are running outside of the kubemark cluster.
export KUBE_ENABLE_CLUSTER_AUTOSCALER=false export KUBE_ENABLE_CLUSTER_AUTOSCALER=false
export KUBE_ENABLE_CLUSTER_DNS=false export KUBE_ENABLE_CLUSTER_DNS=false
@ -56,12 +60,12 @@ function create-kubemark-master {
export KUBE_ENABLE_CLUSTER_MONITORING="none" export KUBE_ENABLE_CLUSTER_MONITORING="none"
export KUBE_ENABLE_L7_LOADBALANCING="none" export KUBE_ENABLE_L7_LOADBALANCING="none"
# Unset env variables set by kubetest for 'root cluster'. We need recompute them # Unset env variables set by kubetest for 'root cluster'. We need recompute them
# for kubemark master. # for kubemark master.
# TODO(mborsz): Figure out some better way to filter out such env variables than # TODO(mborsz): Figure out some better way to filter out such env variables than
# listing them here. # listing them here.
unset MASTER_SIZE MASTER_DISK_SIZE MASTER_ROOT_DISK_SIZE unset MASTER_SIZE MASTER_DISK_SIZE MASTER_ROOT_DISK_SIZE
# Set kubemark-specific overrides: # Set kubemark-specific overrides:
# for each defined env KUBEMARK_X=Y call export X=Y. # for each defined env KUBEMARK_X=Y call export X=Y.
for var in ${!KUBEMARK_*}; do for var in ${!KUBEMARK_*}; do
@ -70,21 +74,36 @@ function create-kubemark-master {
echo "Setting ${dst_var} to '${val}'" echo "Setting ${dst_var} to '${val}'"
export "${dst_var}"="${val}" export "${dst_var}"="${val}"
done done
"${KUBE_ROOT}/hack/e2e-internal/e2e-up.sh" "${KUBE_ROOT}/hack/e2e-internal/e2e-up.sh"
if [[ "${KUBEMARK_HA_MASTER:-}" == "true" && -n "${KUBEMARK_MASTER_ADDITIONAL_ZONES:-}" ]]; then
for KUBE_GCE_ZONE in ${KUBEMARK_MASTER_ADDITIONAL_ZONES}; do
KUBE_GCE_ZONE="${KUBE_GCE_ZONE}" KUBE_REPLICATE_EXISTING_MASTER=true \
"${KUBE_ROOT}/hack/e2e-internal/e2e-grow-cluster.sh"
done
fi
) )
} }
function delete-kubemark-master { function delete-kubemark-master {
# We intentionally override env vars in subshell to preserve original values. # We intentionally override env vars in subshell to preserve original values.
# shellcheck disable=SC2030,SC2031 # shellcheck disable=SC2030,SC2031
( (
export CLUSTER_NAME="${CLUSTER_NAME}-kubemark" export CLUSTER_NAME="${CLUSTER_NAME}-kubemark"
export KUBE_GCE_INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX}-kubemark" export KUBE_GCE_INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX}-kubemark"
export KUBE_DELETE_NETWORK=false export KUBE_DELETE_NETWORK=false
# Even if the "real cluster" is private, we shouldn't manage cloud nat. # Even if the "real cluster" is private, we shouldn't manage cloud nat.
export KUBE_GCE_PRIVATE_CLUSTER=false export KUBE_GCE_PRIVATE_CLUSTER=false
if [[ "${KUBEMARK_HA_MASTER:-}" == "true" && -n "${KUBEMARK_MASTER_ADDITIONAL_ZONES:-}" ]]; then
for KUBE_GCE_ZONE in ${KUBEMARK_MASTER_ADDITIONAL_ZONES}; do
KUBE_GCE_ZONE="${KUBE_GCE_ZONE}" KUBE_REPLICATE_EXISTING_MASTER=true \
"${KUBE_ROOT}/hack/e2e-internal/e2e-shrink-cluster.sh"
done
fi
"${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh" "${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh"
) )
} }