Skip to content

Commit 2ee9260

Browse files
committed
Log and aggregate errors
1 parent 4e79900 commit 2ee9260

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

kubetest2-gke/deployer/down.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package deployer
1818

1919
import (
20+
"errors"
2021
"fmt"
2122
"sync"
2223

@@ -55,19 +56,27 @@ func (d *Deployer) Down() error {
5556
klog.V(1).Infof("Deleted %d network firewall rules", numDeletedFWRules)
5657
}
5758

58-
if err := d.CleanupNat(); err != nil {
59-
klog.Errorf("Error cleaning-up nat: %v", err)
59+
errCleanNat := d.CleanupNat()
60+
if errCleanNat != nil {
61+
klog.Errorf("Error cleaning up NAT: %v", errCleanNat)
6062
}
6163

62-
if err := d.TeardownNetwork(); err != nil {
63-
klog.Errorf("Error tearing-down network: %v", err)
64+
errTeardownNetwork := d.TeardownNetwork()
65+
if errTeardownNetwork != nil {
66+
klog.Errorf("Error tearing down network: %v", errTeardownNetwork)
6467
}
6568

66-
if err := d.DeleteSubnets(d.retryCount); err != nil {
67-
klog.Errorf("Error deleting subnets: %v", err)
69+
errDeleteSubnets := d.DeleteSubnets(d.retryCount)
70+
if errDeleteSubnets != nil {
71+
klog.Errorf("Error deleting subnets: %v", errDeleteSubnets)
6872
}
6973

70-
return d.DeleteNetwork()
74+
errDeleteNetwork := d.DeleteNetwork()
75+
if errDeleteNetwork != nil {
76+
klog.Errorf("Error deleting network: %v", errDeleteNetwork)
77+
}
78+
79+
return errors.Join(errCleanFirewalls, errCleanNat, errTeardownNetwork, errDeleteSubnets, errDeleteNetwork)
7180
}
7281

7382
func (d *Deployer) DeleteClusters(retryCount int) {

0 commit comments

Comments
 (0)