mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #38803 from gmarek/kubemark-etcd-flags
Automatic merge from submit-queue Kubemark etcd flags Fix for #38770. cc @shyamjvs
This commit is contained in:
commit
2e2661c403
@ -22,12 +22,12 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
|
|||||||
# what what is default in hack/lib/etcd.sh
|
# what what is default in hack/lib/etcd.sh
|
||||||
# To avoid it, if it is empty, we set it to 'avoid-overwrite' and
|
# To avoid it, if it is empty, we set it to 'avoid-overwrite' and
|
||||||
# clean it after that.
|
# clean it after that.
|
||||||
if [ -z "${ETCD_IMAGE}" ]; then
|
if [ -z "${ETCD_VERSION:-}" ]; then
|
||||||
ETCD_IMAGE="avoid-overwrite"
|
ETCD_VERSION="avoid-overwrite"
|
||||||
fi
|
fi
|
||||||
source "${KUBE_ROOT}/hack/lib/init.sh"
|
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||||
if [ "${ETCD_IMAGE}" == "avoid-overwrite" ]; then
|
if [ "${ETCD_VERSION:-}" == "avoid-overwrite" ]; then
|
||||||
ETCD_IMAGE=""
|
ETCD_VERSION=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect-project &> /dev/null
|
detect-project &> /dev/null
|
||||||
|
@ -25,37 +25,32 @@ source "${KUBE_ROOT}/test/kubemark/common.sh"
|
|||||||
function writeEnvironmentFile() {
|
function writeEnvironmentFile() {
|
||||||
cat > "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
|
cat > "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
|
||||||
# Generic variables.
|
# Generic variables.
|
||||||
INSTANCE_PREFIX=${INSTANCE_PREFIX}
|
INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
|
||||||
SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE}
|
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
|
||||||
|
|
||||||
# Etcd related variables.
|
# Etcd related variables.
|
||||||
ETCD_IMAGE=2.2.1
|
ETCD_IMAGE="${ETCD_IMAGE:-2.2.1}"
|
||||||
|
ETCD_VERSION="${ETCD_VERSION:-}"
|
||||||
|
|
||||||
# Controller-manager related variables.
|
# Controller-manager related variables.
|
||||||
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS}"
|
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS:-}"
|
||||||
ALLOCATE_NODE_CIDRS=${ALLOCATE_NODE_CIDRS}
|
ALLOCATE_NODE_CIDRS="${ALLOCATE_NODE_CIDRS:-}"
|
||||||
CLUSTER_IP_RANGE=${CLUSTER_IP_RANGE}
|
CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-}"
|
||||||
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD}
|
TERMINATED_POD_GC_THRESHOLD="${TERMINATED_POD_GC_THRESHOLD:-}"
|
||||||
|
|
||||||
# Scheduler related variables.
|
# Scheduler related variables.
|
||||||
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS}"
|
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
|
||||||
|
|
||||||
# Apiserver related variables.
|
# Apiserver related variables.
|
||||||
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS}"
|
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
|
||||||
STORAGE_BACKEND=${STORAGE_BACKEND}
|
STORAGE_BACKEND="${STORAGE_BACKEND:-}"
|
||||||
NUM_NODES=${NUM_NODES}
|
NUM_NODES="${NUM_NODES:-}"
|
||||||
|
CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota}"
|
||||||
EOF
|
EOF
|
||||||
if [ -z "${CUSTOM_ADMISSION_PLUGINS:-}" ]; then
|
|
||||||
cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
|
|
||||||
CUSTOM_ADMISSION_PLUGINS=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
|
|
||||||
EOF
|
|
||||||
else
|
|
||||||
cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
|
|
||||||
CUSTOM_ADMISSION_PLUGINS=${CUSTOM_ADMISSION_PLUGINS}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
writeEnvironmentFile
|
||||||
|
|
||||||
MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
|
MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
|
||||||
|
|
||||||
KUBEMARK_BIN="$(kube::util::find-binary-for-platform kubemark linux/amd64)"
|
KUBEMARK_BIN="$(kube::util::find-binary-for-platform kubemark linux/amd64)"
|
||||||
@ -161,7 +156,6 @@ gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" "${MASTER_NAME}" \
|
|||||||
sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \
|
sudo bash -c \"echo \"${KUBE_PROXY_TOKEN},kube_proxy,kube_proxy\" >> /srv/kubernetes/known_tokens.csv\" && \
|
||||||
sudo bash -c \"echo ${password},admin,admin > /srv/kubernetes/basic_auth.csv\""
|
sudo bash -c \"echo ${password},admin,admin > /srv/kubernetes/basic_auth.csv\""
|
||||||
|
|
||||||
writeEnvironmentFile
|
|
||||||
|
|
||||||
gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
|
gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
|
||||||
"${SERVER_BINARY_TAR}" \
|
"${SERVER_BINARY_TAR}" \
|
||||||
|
@ -57,6 +57,4 @@ rm "${RESOURCE_DIRECTORY}/ca.crt" \
|
|||||||
"${RESOURCE_DIRECTORY}/kubecfg.crt" \
|
"${RESOURCE_DIRECTORY}/kubecfg.crt" \
|
||||||
"${RESOURCE_DIRECTORY}/kubecfg.key" \
|
"${RESOURCE_DIRECTORY}/kubecfg.key" \
|
||||||
"${RESOURCE_DIRECTORY}/hollow-node.json" \
|
"${RESOURCE_DIRECTORY}/hollow-node.json" \
|
||||||
"${RESOURCE_DIRECTORY}/apiserver_flags" \
|
"${RESOURCE_DIRECTORY}/kubemark-master-env.sh" &> /dev/null || true
|
||||||
"${RESOURCE_DIRECTORY}/controllers_flags" \
|
|
||||||
"${RESOURCE_DIRECTORY}/scheduler_flags" &> /dev/null || true
|
|
||||||
|
Loading…
Reference in New Issue
Block a user