github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72022 from wojtek-t/allow_external_etcd

Browse Source 
Allow for configuring etcd servers addresses in kubemark
This commit is contained in:
Kubernetes Prow Robot 2018-12-14 05:38:37 -08:00 committed by GitHub
commit 8ab955f82d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

@ -2845,8 +2845,10 @@ function main() {
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
compute-master-manifest-variables compute-master-manifest-variables
start-etcd-servers if [[ -z "${ETCD_SERVERS:-}" ]]; then
start-etcd-empty-dir-cleanup-pod start-etcd-servers
start-etcd-empty-dir-cleanup-pod
fi
start-kube-apiserver start-kube-apiserver
start-kube-controller-manager start-kube-controller-manager
start-kube-scheduler start-kube-scheduler

2
cluster/kubemark/gce/config-default.sh
View File

@ -66,6 +66,8 @@ ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}"
# non-default version. # non-default version.
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
ETCD_VERSION="${TEST_ETCD_VERSION:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}"
ETCD_SERVERS="${KUBEMARK_ETCD_SERVERS:-}"
ETCD_SERVERS_OVERRIDES="${KUBEMARK_ETCD_SERVERS_OVERRIDES:-}"
# Storage backend. 'etcd2' and 'etcd3' are supported. # Storage backend. 'etcd2' and 'etcd3' are supported.
STORAGE_BACKEND=${STORAGE_BACKEND:-} STORAGE_BACKEND=${STORAGE_BACKEND:-}

16
test/kubemark/resources/start-kubemark-master.sh
View File

@ -489,11 +489,11 @@ function compute-etcd-events-params {
function compute-kube-apiserver-params { function compute-kube-apiserver-params {
local params="${APISERVER_TEST_ARGS:-}" local params="${APISERVER_TEST_ARGS:-}"
params+=" --insecure-bind-address=0.0.0.0" params+=" --insecure-bind-address=0.0.0.0"
params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}"
if [[ -z "${ETCD_SERVERS:-}" ]]; then if [[ -z "${ETCD_SERVERS:-}" ]]; then
params+=" --etcd-servers=http://127.0.0.1:2379" params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#${EVENT_STORE_URL}}"
params+=" --etcd-servers-overrides=/events#${EVENT_STORE_URL}" elif [[ -n "${ETCD_SERVERS_OVERRIDES:-}" ]]; then
else params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-}"
params+=" --etcd-servers=${ETCD_SERVERS}"
fi fi
params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert" params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert"
params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key" params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key"
@ -704,9 +704,11 @@ readonly audit_policy_file="/etc/audit_policy.config"
# Start kubelet as a supervisord process and master components as pods. # Start kubelet as a supervisord process and master components as pods.
start-kubelet start-kubelet
start-kubemaster-component "etcd" if [[ -z "${ETCD_SERVERS:-}" ]]; then
if [ "${EVENT_STORE_IP:-}" == "127.0.0.1" ]; then start-kubemaster-component "etcd"
start-kubemaster-component "etcd-events" if [ "${EVENT_STORE_IP:-}" == "127.0.0.1" ]; then
start-kubemaster-component "etcd-events"
fi
fi fi
start-kubemaster-component "kube-apiserver" start-kubemaster-component "kube-apiserver"
start-kubemaster-component "kube-controller-manager" start-kubemaster-component "kube-controller-manager"

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

@ -80,6 +80,8 @@ SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}" APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
STORAGE_MEDIA_TYPE="${STORAGE_MEDIA_TYPE:-}" STORAGE_MEDIA_TYPE="${STORAGE_MEDIA_TYPE:-}"
STORAGE_BACKEND="${STORAGE_BACKEND:-etcd3}" STORAGE_BACKEND="${STORAGE_BACKEND:-etcd3}"
ETCD_SERVERS="${ETCD_SERVERS:-}"
ETCD_SERVERS_OVERRIDES="${ETCD_SERVERS_OVERRIDES:-}"
ETCD_COMPACTION_INTERVAL_SEC="${ETCD_COMPACTION_INTERVAL_SEC:-}" ETCD_COMPACTION_INTERVAL_SEC="${ETCD_COMPACTION_INTERVAL_SEC:-}"
RUNTIME_CONFIG="${RUNTIME_CONFIG:-}" RUNTIME_CONFIG="${RUNTIME_CONFIG:-}"
NUM_NODES="${NUM_NODES:-}" NUM_NODES="${NUM_NODES:-}"