scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51690 from bowei/service-as-2ndary

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51583, 51283, 51374, 51690, 51716)

Create a secondary range for the services instead of a subnetwork

GCE now supports >1 secondary ranges / subnetwork.

Fixes #51774 

```release-note
When using IP aliases, use a secondary range rather than subnetwork to reserve cluster IPs.
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-02 20:35:26 -07:00
committed by GitHub
parent dceff77669 b145beb3da
commit af52d4403c
1 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cluster/gce/util.sh
View File

@@ -849,7 +849,8 @@ function create-subnetworks() {
--network ${NETWORK} \ --network ${NETWORK} \
--region ${REGION} \ --region ${REGION} \
--range ${NODE_IP_RANGE} \ --range ${NODE_IP_RANGE} \
--secondary-range "pods-default=${CLUSTER_IP_RANGE}" --secondary-range "pods-default=${CLUSTER_IP_RANGE}" \
--secondary-range "services-default=${SERVICE_CLUSTER_IP_RANGE}"
echo "Created subnetwork ${IP_ALIAS_SUBNETWORK}" echo "Created subnetwork ${IP_ALIAS_SUBNETWORK}"
else else
if ! echo ${subnet} | grep --quiet secondaryIpRanges ${subnet}; then if ! echo ${subnet} | grep --quiet secondaryIpRanges ${subnet}; then
@@ -857,31 +858,6 @@ function create-subnetworks() {
exit 1 exit 1
fi fi
fi fi
# Services subnetwork.
local subnet=$(gcloud beta compute networks subnets describe \
--project "${PROJECT}" \
--region ${REGION} \
${SERVICE_CLUSTER_IP_SUBNETWORK} 2>/dev/null)
if [[ -z ${subnet} ]]; then
if [[ ${SERVICE_CLUSTER_IP_SUBNETWORK} != ${INSTANCE_PREFIX}-subnet-services ]]; then
echo "${color_red}Subnetwork ${NETWORK}:${SERVICE_CLUSTER_IP_SUBNETWORK} does not exist${color_norm}"
exit 1
fi
echo "Creating subnet for reserving service cluster IPs ${NETWORK}:${SERVICE_CLUSTER_IP_SUBNETWORK}"
gcloud beta compute networks subnets create \
${SERVICE_CLUSTER_IP_SUBNETWORK} \
--description "Automatically generated subnet for ${INSTANCE_PREFIX} cluster. This will be removed on cluster teardown." \
--project "${PROJECT}" \
--network ${NETWORK} \
--region ${REGION} \
--range ${SERVICE_CLUSTER_IP_RANGE}
echo "Created subnetwork ${SERVICE_CLUSTER_IP_SUBNETWORK}"
else
echo "Subnet ${SERVICE_CLUSTER_IP_SUBNETWORK} already exists"
fi
} }
function delete-firewall-rules() { function delete-firewall-rules() {
@@ -934,19 +910,6 @@ function delete-subnetworks() {
${IP_ALIAS_SUBNETWORK} ${IP_ALIAS_SUBNETWORK}
fi fi
fi fi
if [[ ${SERVICE_CLUSTER_IP_SUBNETWORK} == ${INSTANCE_PREFIX}-subnet-services ]]; then
echo "Removing auto-created subnet ${NETWORK}:${SERVICE_CLUSTER_IP_SUBNETWORK}"
if [[ -n $(gcloud beta compute networks subnets describe \
--project "${PROJECT}" \
--region ${REGION} \
${SERVICE_CLUSTER_IP_SUBNETWORK} 2>/dev/null) ]]; then
gcloud --quiet beta compute networks subnets delete \
--project "${PROJECT}" \
--region ${REGION} \
${SERVICE_CLUSTER_IP_SUBNETWORK}
fi
fi
} }
# Generates SSL certificates for etcd cluster. Uses cfssl program. # Generates SSL certificates for etcd cluster. Uses cfssl program.