From d39f196292590507a64bcf1b498a40b15a28c155 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 5 Feb 2021 16:39:28 +0800 Subject: [PATCH 1/3] pkg/apis/kops/validation/validation: Fix ineffectual assignment to optionTaken Signed-off-by: Li Zhijian --- pkg/apis/kops/validation/validation.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 42bd3f1323..b04cd20847 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -627,7 +627,6 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * if optionTaken { allErrs = append(allErrs, field.Forbidden(fldPath.Child("gce"), "only one networking option permitted")) } - optionTaken = true allErrs = append(allErrs, validateNetworkingGCE(c, v.GCE, fldPath.Child("gce"))...) } From f1484df4b8dd180a2ec56c93ad4eed4beef7b0b1 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 5 Feb 2021 16:40:39 +0800 Subject: [PATCH 2/3] upup/pkg/fi/cloudup/alitasks/rampolicy: Fix ineffectual assignment to policyRequest Signed-off-by: Li Zhijian --- upup/pkg/fi/cloudup/alitasks/rampolicy.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/upup/pkg/fi/cloudup/alitasks/rampolicy.go b/upup/pkg/fi/cloudup/alitasks/rampolicy.go index deb100fe91..a82156ba06 100644 --- a/upup/pkg/fi/cloudup/alitasks/rampolicy.go +++ b/upup/pkg/fi/cloudup/alitasks/rampolicy.go @@ -103,12 +103,10 @@ func (_ *RAMPolicy) RenderALI(t *aliup.ALIAPITarget, a, e, changes *RAMPolicy) e return fmt.Errorf("error rendering PolicyDocument: %v", err) } - policyRequest := ram.PolicyRequest{} - if a == nil { klog.V(2).Infof("Creating RAMPolicy with Name:%q", fi.StringValue(e.Name)) - policyRequest = ram.PolicyRequest{ + policyRequest := ram.PolicyRequest{ PolicyName: fi.StringValue(e.Name), PolicyDocument: policy, PolicyType: ram.Type(fi.StringValue(e.PolicyType)), From 501df662d49959292c5b7dd1e8f3e689a16ceb43 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 5 Feb 2021 16:41:55 +0800 Subject: [PATCH 3/3] upup/pkg/fi/cloudup/gcetasks/subnet: Fix ineffectual assignment to patch Signed-off-by: Li Zhijian --- upup/pkg/fi/cloudup/gcetasks/subnet.go | 1 - 1 file changed, 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/gcetasks/subnet.go b/upup/pkg/fi/cloudup/gcetasks/subnet.go index 6f2228dcd1..298c04ff0f 100644 --- a/upup/pkg/fi/cloudup/gcetasks/subnet.go +++ b/upup/pkg/fi/cloudup/gcetasks/subnet.go @@ -171,7 +171,6 @@ func (_ *Subnet) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Subnet) error { if err != nil { return fmt.Errorf("error patching Subnet: %v", err) } - patch = false _, err = cloud.Compute().Subnetworks.Get(cloud.Project(), cloud.Region(), *e.GCEName).Do() if err != nil { return fmt.Errorf("error fetching subnet for patch: %v", err)