From bf603f698de7fe252a2980924502c3e833f53883 Mon Sep 17 00:00:00 2001 From: eulerzgy Date: Wed, 30 Sep 2015 16:17:25 +0800 Subject: [PATCH] change minion to node for rackspace --- ...oud-config.yaml => node-cloud-config.yaml} | 2 +- cluster/rackspace/config-default.sh | 10 ++-- cluster/rackspace/util.sh | 58 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) rename cluster/rackspace/cloud-config/{minion-cloud-config.yaml => node-cloud-config.yaml} (99%) mode change 100644 => 100755 mode change 100644 => 100755 cluster/rackspace/config-default.sh mode change 100644 => 100755 cluster/rackspace/util.sh diff --git a/cluster/rackspace/cloud-config/minion-cloud-config.yaml b/cluster/rackspace/cloud-config/node-cloud-config.yaml old mode 100644 new mode 100755 similarity index 99% rename from cluster/rackspace/cloud-config/minion-cloud-config.yaml rename to cluster/rackspace/cloud-config/node-cloud-config.yaml index 0f59551195b..563b5ffa4fc --- a/cluster/rackspace/cloud-config/minion-cloud-config.yaml +++ b/cluster/rackspace/cloud-config/node-cloud-config.yaml @@ -77,7 +77,7 @@ write_files: coreos: etcd: - name: kubernetes-minion-INDEX + name: kubernetes-node-INDEX discovery: https://discovery.etcd.io/DISCOVERY_ID addr: $private_ipv4:4001 peer-addr: $private_ipv4:7001 diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh old mode 100644 new mode 100755 index dd436130eac..96652ad059d --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -16,7 +16,7 @@ # Sane defaults for dev environments. The following variables can be easily overriden # by setting each as a ENV variable ahead of time: -# KUBE_IMAGE, KUBE_MASTER_FLAVOR, KUBE_MINION_FLAVOR, NUM_MINIONS, NOVA_NETWORK and SSH_KEY_NAME +# KUBE_IMAGE, KUBE_MASTER_FLAVOR, KUBE_NODE_FLAVOR, NUM_MINIONS, NOVA_NETWORK and SSH_KEY_NAME # Shared KUBE_IMAGE="${KUBE_IMAGE-f2a71670-ced3-4274-80b6-0efcd0f8f91b}" # CoreOS(Beta) @@ -30,11 +30,11 @@ KUBE_MASTER_FLAVOR="${KUBE_MASTER_FLAVOR-general1-1}" MASTER_NAME="${INSTANCE_PREFIX}-master" MASTER_TAG="tags=${INSTANCE_PREFIX}-master" -# Minion -KUBE_MINION_FLAVOR="${KUBE_MINION_FLAVOR-general1-2}" +# Node +KUBE_NODE_FLAVOR="${KUBE_NODE_FLAVOR-general1-2}" NUM_MINIONS="${NUM_MINIONS-4}" -MINION_TAG="tags=${INSTANCE_PREFIX}-minion" -MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}})) +NODE_TAG="tags=${INSTANCE_PREFIX}-node" +NODE_NAMES=($(eval echo ${INSTANCE_PREFIX}-node-{1..${NUM_MINIONS}})) KUBE_NETWORK="10.240.0.0/16" SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh old mode 100644 new mode 100755 index 55e0cf8b536..b249fcbf695 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -121,9 +121,9 @@ copy_dev_tarballs() { } prep_known_tokens() { - for (( i=0; i<${#MINION_NAMES[@]}; i++)); do - generate_kubelet_tokens ${MINION_NAMES[i]} - cat ${KUBE_TEMP}/${MINION_NAMES[i]}_tokens.csv >> ${KUBE_TEMP}/known_tokens.csv + for (( i=0; i<${#NODE_NAMES[@]}; i++)); do + generate_kubelet_tokens ${NODE_NAMES[i]} + cat ${KUBE_TEMP}/${NODE_NAMES[i]}_tokens.csv >> ${KUBE_TEMP}/known_tokens.csv done # Generate tokens for other "service accounts". Append to known_tokens. @@ -175,14 +175,14 @@ ${MASTER_NAME}" $MASTER_BOOT_CMD } -rax-boot-minions() { +rax-boot-nodes() { - cp $(dirname $0)/rackspace/cloud-config/minion-cloud-config.yaml \ - ${KUBE_TEMP}/minion-cloud-config.yaml + cp $(dirname $0)/rackspace/cloud-config/node-cloud-config.yaml \ + ${KUBE_TEMP}/node-cloud-config.yaml - for (( i=0; i<${#MINION_NAMES[@]}; i++)); do + for (( i=0; i<${#NODE_NAMES[@]}; i++)); do - get_tokens_from_csv ${MINION_NAMES[i]} + get_tokens_from_csv ${NODE_NAMES[i]} sed -e "s|DISCOVERY_ID|${DISCOVERY_ID}|" \ -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\\&}|" \ @@ -196,22 +196,22 @@ rax-boot-minions() { -e "s|KUBELET_TOKEN|${KUBELET_TOKEN}|" \ -e "s|KUBE_PROXY_TOKEN|${KUBE_PROXY_TOKEN}|" \ -e "s|LOGGING_DESTINATION|${LOGGING_DESTINATION:-}|" \ - $(dirname $0)/rackspace/cloud-config/minion-cloud-config.yaml > $KUBE_TEMP/minion-cloud-config-$(($i + 1)).yaml + $(dirname $0)/rackspace/cloud-config/node-cloud-config.yaml > $KUBE_TEMP/node-cloud-config-$(($i + 1)).yaml - MINION_BOOT_CMD="nova boot \ + NODE_BOOT_CMD="nova boot \ --key-name ${SSH_KEY_NAME} \ ---flavor ${KUBE_MINION_FLAVOR} \ +--flavor ${KUBE_NODE_FLAVOR} \ --image ${KUBE_IMAGE} \ ---meta ${MINION_TAG} \ ---user-data ${KUBE_TEMP}/minion-cloud-config-$(( i +1 )).yaml \ +--meta ${NODE_TAG} \ +--user-data ${KUBE_TEMP}/node-cloud-config-$(( i +1 )).yaml \ --config-drive true \ --nic net-id=${NETWORK_UUID} \ -${MINION_NAMES[$i]}" +${NODE_NAMES[$i]}" - echo "cluster/rackspace/util.sh: Booting ${MINION_NAMES[$i]} with following command:" - echo -e "\t$MINION_BOOT_CMD" - $MINION_BOOT_CMD + echo "cluster/rackspace/util.sh: Booting ${NODE_NAMES[$i]} with following command:" + echo -e "\t$NODE_BOOT_CMD" + $NODE_BOOT_CMD done } @@ -229,16 +229,16 @@ rax-nova-network() { fi } -detect-minions() { - KUBE_MINION_IP_ADDRESSES=() - for (( i=0; i<${#MINION_NAMES[@]}; i++)); do - local minion_ip=$(nova show --minimal ${MINION_NAMES[$i]} \ +detect-nodes() { + KUBE_NODE_IP_ADDRESSES=() + for (( i=0; i<${#NODE_NAMES[@]}; i++)); do + local node_ip=$(nova show --minimal ${NODE_NAMES[$i]} \ | grep accessIPv4 | awk '{print $4}') - echo "cluster/rackspace/util.sh: Found ${MINION_NAMES[$i]} at ${minion_ip}" - KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") + echo "cluster/rackspace/util.sh: Found ${NODE_NAMES[$i]} at ${node_ip}" + KUBE_NODE_IP_ADDRESSES+=("${node_ip}") done - if [ -z "$KUBE_MINION_IP_ADDRESSES" ]; then - echo "cluster/rackspace/util.sh: Could not detect Kubernetes minion nodes. Make sure you've launched a cluster with 'kube-up.sh'" + if [ -z "$KUBE_NODE_IP_ADDRESSES" ]; then + echo "cluster/rackspace/util.sh: Could not detect Kubernetes node nodes. Make sure you've launched a cluster with 'kube-up.sh'" exit 1 fi @@ -283,7 +283,7 @@ kube-up() { # developer up. find-object-url - # Create a temp directory to hold scripts that will be uploaded to master/minions + # Create a temp directory to hold scripts that will be uploaded to master/nodes KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX) trap "rm -rf ${KUBE_TEMP}" EXIT @@ -301,7 +301,7 @@ kube-up() { prep_known_tokens rax-boot-master - rax-boot-minions + rax-boot-nodes detect-master @@ -349,11 +349,11 @@ kube-up() { # Don't bail on errors, we want to be able to print some info. set +e - detect-minions + detect-nodes # ensures KUBECONFIG is set get-kubeconfig-basicauth - echo "All minions may not be online yet, this is okay." + echo "All nodes may not be online yet, this is okay." echo echo "Kubernetes cluster is running. The master is running at:" echo