github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add switch to control use of pv for etcd in federation CI jobs

pull/6/head
shashidharatd 2017-09-18 07:18:18 +05:30
parent b188868fd9
commit 7a633b5519
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/cluster/common.sh
View File

@ -25,6 +25,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}" FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-system} FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-system}
FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-${FEDERATION_NAME}}" FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-${FEDERATION_NAME}}"
FEDERATION_USE_PV_FOR_ETCD=${FEDERATION_USE_PV_FOR_ETCD:-false}
HOST_CLUSTER_ZONE="${FEDERATION_HOST_CLUSTER_ZONE:-}" HOST_CLUSTER_ZONE="${FEDERATION_HOST_CLUSTER_ZONE:-}"
# If $HOST_CLUSTER_ZONE isn't specified, arbitrarily choose # If $HOST_CLUSTER_ZONE isn't specified, arbitrarily choose
# last zone as the host cluster zone. # last zone as the host cluster zone.

3
federation/cluster/federation-up.sh
View File

@ -30,7 +30,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
# "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG # "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG
source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/cluster/common.sh"
# For $FEDERATION_NAME, $FEDERATION_NAMESPACE, $FEDERATION_KUBE_CONTEXT, # For $FEDERATION_NAME, $FEDERATION_NAMESPACE, $FEDERATION_KUBE_CONTEXT,
# and $HOST_CLUSTER_CONTEXT. # $HOST_CLUSTER_CONTEXT and $FEDERATION_USE_PV_FOR_ETCD.
source "${KUBE_ROOT}/federation/cluster/common.sh" source "${KUBE_ROOT}/federation/cluster/common.sh"
DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}" DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}"
@ -118,6 +118,7 @@ function init() {
--apiserver-enable-token-auth=true \ --apiserver-enable-token-auth=true \
--apiserver-arg-overrides="--runtime-config=api/all=true,--v=4" \ --apiserver-arg-overrides="--runtime-config=api/all=true,--v=4" \
--controllermanager-arg-overrides="--v=4" \ --controllermanager-arg-overrides="--v=4" \
--etcd-persistent-storage=${FEDERATION_USE_PV_FOR_ETCD} \
--v=4 --v=4
} }