mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Fix the kubemark fix
This commit is contained in:
parent
10b39d9dd7
commit
40907930a3
@ -22,12 +22,12 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
|
||||
# what what is default in hack/lib/etcd.sh
|
||||
# To avoid it, if it is empty, we set it to 'avoid-overwrite' and
|
||||
# clean it after that.
|
||||
if [ -z "${ETCD_IMAGE}" ]; then
|
||||
ETCD_IMAGE="avoid-overwrite"
|
||||
if [ -z "${ETCD_VERSION:-}" ]; then
|
||||
ETCD_VERSION="avoid-overwrite"
|
||||
fi
|
||||
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
if [ "${ETCD_IMAGE}" == "avoid-overwrite" ]; then
|
||||
ETCD_IMAGE=""
|
||||
if [ "${ETCD_VERSION:-}" == "avoid-overwrite" ]; then
|
||||
ETCD_VERSION=""
|
||||
fi
|
||||
|
||||
detect-project &> /dev/null
|
||||
|
@ -29,7 +29,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
|
||||
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
|
||||
|
||||
# Etcd related variables.
|
||||
ETCD_IMAGE="${ETCD_IMAGE:-}"
|
||||
ETCD_IMAGE="${ETCD_IMAGE:-2.2.1}"
|
||||
ETCD_VERSION="${ETCD_VERSION:-}"
|
||||
|
||||
# Controller-manager related variables.
|
||||
@ -49,6 +49,8 @@ CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-NamespaceLifecycle,LimitRa
|
||||
EOF
|
||||
}
|
||||
|
||||
writeEnvironmentFile
|
||||
|
||||
MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
|
||||
|
||||
KUBEMARK_BIN="$(kube::util::find-binary-for-platform kubemark linux/amd64)"
|
||||
@ -154,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 ${password},admin,admin > /srv/kubernetes/basic_auth.csv\""
|
||||
|
||||
writeEnvironmentFile
|
||||
|
||||
gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
|
||||
"${SERVER_BINARY_TAR}" \
|
||||
|
Loading…
Reference in New Issue
Block a user