Skip to content

K
k3s
Commit 8dee3892 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29301 from zmerlynn/get-aws-back

Automatic merge from submit-queue AWS kube-up: Fix unbound KUBE_MANIFESTS_TAR_URL variable in Salt config It shouldn't be necessary for all distros to define this env variable (broken in 97f3f808). This should get our e2es back creating AWS clusters, at least.
parents d0ddefff 0750eaf5
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/common.sh
View file @ 8dee3892
...@@ -517,7 +517,7 @@ function build-kube-env { ...@@ -517,7 +517,7 @@ function build-kube-env {
local server_binary_tar_url=$SERVER_BINARY_TAR_URL local server_binary_tar_url=$SERVER_BINARY_TAR_URL
local salt_tar_url=$SALT_TAR_URL local salt_tar_url=$SALT_TAR_URL
local kube_manifests_tar_url=$KUBE_MANIFESTS_TAR_URL local kube_manifests_tar_url="${KUBE_MANIFESTS_TAR_URL:-}"
if [[ "${master}" == "true" && "${MASTER_OS_DISTRIBUTION}" == "coreos" ]] || \ if [[ "${master}" == "true" && "${MASTER_OS_DISTRIBUTION}" == "coreos" ]] || \
[[ "${master}" == "false" && "${NODE_OS_DISTRIBUTION}" == "coreos" ]] ; then [[ "${master}" == "false" && "${NODE_OS_DISTRIBUTION}" == "coreos" ]] ; then
# TODO: Support fallback .tar.gz settings on CoreOS # TODO: Support fallback .tar.gz settings on CoreOS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment