mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #18736 from miry/existen-subnet-with-ten
Auto commit by PR queue bot
This commit is contained in:
commit
e4eb02af01
@ -76,13 +76,15 @@ AWS_ASG_CMD="aws autoscaling"
|
|||||||
|
|
||||||
VPC_CIDR_BASE=172.20
|
VPC_CIDR_BASE=172.20
|
||||||
MASTER_IP_SUFFIX=.9
|
MASTER_IP_SUFFIX=.9
|
||||||
MASTER_INTERNAL_IP=${VPC_CIDR_BASE}.0${MASTER_IP_SUFFIX}
|
|
||||||
VPC_CIDR=${VPC_CIDR_BASE}.0.0/16
|
VPC_CIDR=${VPC_CIDR_BASE}.0.0/16
|
||||||
SUBNET_CIDR=${VPC_CIDR_BASE}.0.0/24
|
SUBNET_CIDR=${VPC_CIDR_BASE}.0.0/24
|
||||||
if [[ -n "${KUBE_SUBNET_CIDR:-}" ]]; then
|
if [[ -n "${KUBE_SUBNET_CIDR:-}" ]]; then
|
||||||
echo "Using subnet CIDR override: ${KUBE_SUBNET_CIDR}"
|
echo "Using subnet CIDR override: ${KUBE_SUBNET_CIDR}"
|
||||||
SUBNET_CIDR=${KUBE_SUBNET_CIDR}
|
SUBNET_CIDR=${KUBE_SUBNET_CIDR}
|
||||||
fi
|
fi
|
||||||
|
if [[ -z "${MASTER_INTERNAL_IP-}" ]]; then
|
||||||
|
MASTER_INTERNAL_IP="${SUBNET_CIDR%.*}${MASTER_IP_SUFFIX}"
|
||||||
|
fi
|
||||||
|
|
||||||
MASTER_SG_NAME="kubernetes-master-${CLUSTER_ID}"
|
MASTER_SG_NAME="kubernetes-master-${CLUSTER_ID}"
|
||||||
NODE_SG_NAME="kubernetes-minion-${CLUSTER_ID}"
|
NODE_SG_NAME="kubernetes-minion-${CLUSTER_ID}"
|
||||||
@ -506,13 +508,13 @@ function ensure-master-ip {
|
|||||||
else
|
else
|
||||||
KUBE_MASTER_IP=`$AWS_CMD allocate-address --domain vpc --query PublicIp`
|
KUBE_MASTER_IP=`$AWS_CMD allocate-address --domain vpc --query PublicIp`
|
||||||
echo "Allocated Elastic IP for master: ${KUBE_MASTER_IP}"
|
echo "Allocated Elastic IP for master: ${KUBE_MASTER_IP}"
|
||||||
|
|
||||||
# We can't tag elastic ips. Instead we put the tag on the persistent disk.
|
|
||||||
# It is a little weird, perhaps, but it sort of makes sense...
|
|
||||||
# The master mounts the master PD, and whoever mounts the master PD should also
|
|
||||||
# have the master IP
|
|
||||||
add-tag ${MASTER_DISK_ID} ${TAG_KEY_MASTER_IP} ${KUBE_MASTER_IP}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# We can't tag elastic ips. Instead we put the tag on the persistent disk.
|
||||||
|
# It is a little weird, perhaps, but it sort of makes sense...
|
||||||
|
# The master mounts the master PD, and whoever mounts the master PD should also
|
||||||
|
# have the master IP
|
||||||
|
add-tag ${MASTER_DISK_ID} ${TAG_KEY_MASTER_IP} ${KUBE_MASTER_IP}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -790,11 +792,10 @@ function subnet-setup {
|
|||||||
else
|
else
|
||||||
EXISTING_CIDR=$($AWS_CMD describe-subnets --subnet-ids ${SUBNET_ID} --query Subnets[].CidrBlock)
|
EXISTING_CIDR=$($AWS_CMD describe-subnets --subnet-ids ${SUBNET_ID} --query Subnets[].CidrBlock)
|
||||||
echo "Using existing subnet with CIDR $EXISTING_CIDR"
|
echo "Using existing subnet with CIDR $EXISTING_CIDR"
|
||||||
VPC_CIDR=$($AWS_CMD describe-vpcs --vpc-ids ${VPC_ID} --query Vpcs[].CidrBlock)
|
if [ ! $SUBNET_CIDR = $EXISTING_CIDR ]; then
|
||||||
echo "VPC CIDR is $VPC_CIDR"
|
MASTER_INTERNAL_IP="${EXISTING_CIDR%.*}${MASTER_IP_SUFFIX}"
|
||||||
VPC_CIDR_BASE=${VPC_CIDR%.*.*}
|
echo "Assuming MASTER_INTERNAL_IP=${MASTER_INTERNAL_IP}"
|
||||||
MASTER_INTERNAL_IP=${VPC_CIDR_BASE}.0${MASTER_IP_SUFFIX}
|
fi
|
||||||
echo "Assuming MASTER_INTERNAL_IP=${MASTER_INTERNAL_IP}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Using subnet $SUBNET_ID"
|
echo "Using subnet $SUBNET_ID"
|
||||||
|
Loading…
Reference in New Issue
Block a user