Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
92ef912f
Commit
92ef912f
authored
Oct 13, 2016
by
Matt Liggett
Committed by
GitHub
Oct 13, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #34750 from ixdy/cleanup-network
Don't fail teardown if we can't delete the network
parents
a474b2b9
6b65d4a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
util.sh
cluster/gce/util.sh
+1
-1
util.sh
cluster/gke/util.sh
+0
-1
No files found.
cluster/gce/util.sh
View file @
92ef912f
...
...
@@ -1362,7 +1362,7 @@ function kube-down() {
"
${
NETWORK
}
-default-ssh"
\
"
${
NETWORK
}
-default-internal"
# Pre-1.5 clusters
if
[[
"
${
KUBE_DELETE_NETWORK
}
"
==
"true"
]]
;
then
delete-network
delete-network
||
true
# might fail if there are leaked firewall rules
fi
# If there are no more remaining master replicas, we should update kubeconfig.
...
...
cluster/gke/util.sh
View file @
92ef912f
...
...
@@ -387,7 +387,6 @@ function test-teardown() {
if
!
"
${
GCLOUD
}
"
compute networks delete
--project
"
${
PROJECT
}
"
--quiet
"
${
NETWORK
}
"
;
then
echo
"Failed to delete network '
${
NETWORK
}
'. Listing firewall-rules:"
"
${
GCLOUD
}
"
compute firewall-rules
--project
"
${
PROJECT
}
"
list
--filter
=
"network=
${
NETWORK
}
"
return
1
fi
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment