From 95ca054e50ca8b6cfb50a6ed7b676f571f4c25ea Mon Sep 17 00:00:00 2001 From: David Zhu Date: Fri, 8 Mar 2019 16:39:10 -0800 Subject: [PATCH] don't fail firewall rule insert if rule already exists --- test/remote/instance.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/remote/instance.go b/test/remote/instance.go index 1516f683d..f0da2ac70 100644 --- a/test/remote/instance.go +++ b/test/remote/instance.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common" + gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute" ) const ( @@ -238,6 +239,10 @@ func (i *InstanceInfo) createDefaultFirewallRule() error { } _, err = i.computeService.Firewalls.Insert(i.project, f).Do() if err != nil { + if gce.IsGCEError(err, "alreadyExists") { + glog.V(4).Infof("Default firewall rule %v already exists, skipping creation", defaultFirewallRule) + return nil + } return fmt.Errorf("Failed to insert required default SSH firewall Rule %v: %v", defaultFirewallRule, err) } } else {