github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62398 from shyamjvs/ip-alias-subnet-deletion-fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 60585, 62398, 62258, 62042). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix subnet cleanup logic when using IP-aliases with custom subnets

This is the reason why we're seeing failures in our 100-node scalability presubmit (i.e network failed to delete due to undeleted subnets and eventually networks quota is exhausted in the project).

/cc @wojtek-t @kubernetes/sig-network-bugs 

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-11 17:31:22 -07:00 committed by GitHub
commit 9d01a8085a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/gce/util.sh
View File

@ -1817,8 +1817,7 @@ function delete-network() {
} }
function delete-subnetworks() { function delete-subnetworks() {
if [[ ${ENABLE_IP_ALIASES:-} != "true" ]]; then # If running in custom mode network we need to delete subnets manually.
# If running in custom mode network we need to delete subnets
mode="$(check-network-mode)" mode="$(check-network-mode)"
if [[ "${mode}" == "CUSTOM" ]]; then if [[ "${mode}" == "CUSTOM" ]]; then
if [[ "${ENABLE_BIG_CLUSTER_SUBNETS}" = "true" ]]; then if [[ "${ENABLE_BIG_CLUSTER_SUBNETS}" = "true" ]]; then
@ -1831,12 +1830,15 @@ function delete-subnetworks() {
echo "Deleting custom subnet..." echo "Deleting custom subnet..."
gcloud --quiet compute networks subnets delete "${SUBNETWORK}" --project "${NETWORK_PROJECT}" --region="${REGION}" || true gcloud --quiet compute networks subnets delete "${SUBNETWORK}" --project "${NETWORK_PROJECT}" --region="${REGION}" || true
fi fi
fi
return return
fi fi
# Only delete automatically created subnets. # If we reached here, it means we're not using custom network.
if [[ ${IP_ALIAS_SUBNETWORK} == ${INSTANCE_PREFIX}-subnet-default ]]; then # So the only thing we need to check is if IP-aliases was turned
# on and we created a subnet for it. If so, we should delete it.
if [[ ${ENABLE_IP_ALIASES:-} == "true" ]]; then
# Only delete the subnet if we created it (i.e it's not pre-existing).
if [[ -z "${KUBE_GCE_IP_ALIAS_SUBNETWORK:-}" ]]; then
echo "Removing auto-created subnet ${NETWORK}:${IP_ALIAS_SUBNETWORK}" echo "Removing auto-created subnet ${NETWORK}:${IP_ALIAS_SUBNETWORK}"
if [[ -n $(gcloud beta compute networks subnets describe \ if [[ -n $(gcloud beta compute networks subnets describe \
--project "${NETWORK_PROJECT}" \ --project "${NETWORK_PROJECT}" \
@ -1848,6 +1850,7 @@ function delete-subnetworks() {
${IP_ALIAS_SUBNETWORK} ${IP_ALIAS_SUBNETWORK}
fi fi
fi fi
fi
} }
# Generates SSL certificates for etcd cluster. Uses cfssl program. # Generates SSL certificates for etcd cluster. Uses cfssl program.