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

Change AWS_ZONE to ZONE, for compatibility with e2e tests

pull/6/head
Justin Santa Barbara 2015-03-27 08:53:17 -07:00
parent c1337cbaeb
commit 7179f5f004
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/config-default.sh
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
AWS_ZONE=${KUBE_AWS_ZONE:-us-west-2a} ZONE=${KUBE_AWS_ZONE:-us-west-2a}
MASTER_SIZE=${MASTER_SIZE:-t2.micro} MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=${MINION_SIZE:-t2.micro} MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-4} NUM_MINIONS=${NUM_MINIONS:-4}

2
cluster/aws/config-test.sh
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
AWS_ZONE=${KUBE_AWS_ZONE:-us-west-2a} ZONE=${KUBE_AWS_ZONE:-us-west-2a}
MASTER_SIZE=${MASTER_SIZE:-t2.micro} MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=${MINION_SIZE:-t2.micro} MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-2} NUM_MINIONS=${NUM_MINIONS:-2}

2
cluster/aws/options.md
View File

@ -5,7 +5,7 @@ specific to AWS are documented in this file, for cross-provider options see TODO
This is a work-in-progress; not all options are documented yet! This is a work-in-progress; not all options are documented yet!
## KUBE_AWS_ZONE ## ZONE
The AWS availability to deploy to. Defaults to us-west-2a. The AWS availability to deploy to. Defaults to us-west-2a.

2
cluster/aws/templates/salt-master.sh
View File

@ -28,7 +28,7 @@ EOF
cat <<EOF > /etc/aws.conf cat <<EOF > /etc/aws.conf
[Global] [Global]
Zone = ${AWS_ZONE} Zone = ${ZONE}
EOF EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join

4
cluster/aws/util.sh
View File

@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/aws/${KUBE_CONFIG_FILE-"config-default.sh"}" source "${KUBE_ROOT}/cluster/aws/${KUBE_CONFIG_FILE-"config-default.sh"}"
# This removes the final character in bash (somehow) # This removes the final character in bash (somehow)
AWS_REGION=${AWS_ZONE%?} AWS_REGION=${ZONE%?}
export AWS_DEFAULT_REGION=${AWS_REGION} export AWS_DEFAULT_REGION=${AWS_REGION}
AWS_CMD="aws --output json ec2" AWS_CMD="aws --output json ec2"
@ -431,7 +431,7 @@ function kube-up {
echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
echo "readonly SERVER_BINARY_TAR_URL='${SERVER_BINARY_TAR_URL}'" echo "readonly SERVER_BINARY_TAR_URL='${SERVER_BINARY_TAR_URL}'"
echo "readonly SALT_TAR_URL='${SALT_TAR_URL}'" echo "readonly SALT_TAR_URL='${SALT_TAR_URL}'"
echo "readonly AWS_ZONE='${AWS_ZONE}'" echo "readonly ZONE='${ZONE}'"
echo "readonly MASTER_HTPASSWD='${htpasswd}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'"
echo "readonly PORTAL_NET='${PORTAL_NET}'" echo "readonly PORTAL_NET='${PORTAL_NET}'"
echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-false}'" echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-false}'"