kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10739 from zhijianli88/master 

Fix ineffassign issues
This commit is contained in:
Kubernetes Prow Robot 2021-02-05 14:00:31 -08:00 committed by GitHub
parent 5c50fffd0f 501df662d4
commit f7b0f4444a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/kops/validation/validation.go
View File

@ -627,7 +627,6 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath *
if optionTaken { if optionTaken {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("gce"), "only one networking option permitted")) 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"))...) allErrs = append(allErrs, validateNetworkingGCE(c, v.GCE, fldPath.Child("gce"))...)
} }

4
upup/pkg/fi/cloudup/alitasks/rampolicy.go
View File

@ -103,12 +103,10 @@ func (_ *RAMPolicy) RenderALI(t *aliup.ALIAPITarget, a, e, changes *RAMPolicy) e
return fmt.Errorf("error rendering PolicyDocument: %v", err) return fmt.Errorf("error rendering PolicyDocument: %v", err)
} }
policyRequest := ram.PolicyRequest{}
if a == nil { if a == nil {
klog.V(2).Infof("Creating RAMPolicy with Name:%q", fi.StringValue(e.Name)) klog.V(2).Infof("Creating RAMPolicy with Name:%q", fi.StringValue(e.Name))
policyRequest = ram.PolicyRequest{ policyRequest := ram.PolicyRequest{
PolicyName: fi.StringValue(e.Name), PolicyName: fi.StringValue(e.Name),
PolicyDocument: policy, PolicyDocument: policy,
PolicyType: ram.Type(fi.StringValue(e.PolicyType)), PolicyType: ram.Type(fi.StringValue(e.PolicyType)),

1
upup/pkg/fi/cloudup/gcetasks/subnet.go
View File

@ -171,7 +171,6 @@ func (_ *Subnet) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Subnet) error {
if err != nil { if err != nil {
return fmt.Errorf("error patching Subnet: %v", err) return fmt.Errorf("error patching Subnet: %v", err)
} }
patch = false
_, err = cloud.Compute().Subnetworks.Get(cloud.Project(), cloud.Region(), *e.GCEName).Do() _, err = cloud.Compute().Subnetworks.Get(cloud.Project(), cloud.Region(), *e.GCEName).Do()
if err != nil { if err != nil {
return fmt.Errorf("error fetching subnet for patch: %v", err) return fmt.Errorf("error fetching subnet for patch: %v", err)