Merge pull request #1262 from mistikel/update-golongci

bump golangci to v0.38.0
kubernetes-sigs · Mar 25, 2021 · a11e517 · a11e517
2 parents b5ad5c4 + bc8fb00
commit a11e517
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -21,7 +21,6 @@ linters:
     - govet
     - ineffassign
     - interfacer
-    - maligned
     - misspell
     - nakedret
     - prealloc

diff --git a/Makefile b/Makefile
@@ -66,7 +66,7 @@ CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-drone
 
-GOLANGCI_LINT_VER := v1.34.0
+GOLANGCI_LINT_VER := v1.38.0
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

diff --git a/azure/services/bastionhosts/bastionhosts.go b/azure/services/bastionhosts/bastionhosts.go
@@ -75,8 +75,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		s.Scope.V(2).Info("successfully got subnet in vnet", "subnet", bastionSpec.SubnetName, "vNet", bastionSpec.VNetName)
 
 		s.Scope.V(2).Info("checking if public ip exist otherwise will try to create", "publicIP", bastionSpec.PublicIPName)
-		publicIP := network.PublicIPAddress{}
-		publicIP, err = s.publicIPsClient.Get(ctx, s.Scope.ResourceGroup(), bastionSpec.PublicIPName)
+		publicIP, err := s.publicIPsClient.Get(ctx, s.Scope.ResourceGroup(), bastionSpec.PublicIPName)
 		if err != nil && azure.ResourceNotFound(err) {
 			iperr := s.createBastionPublicIP(ctx, bastionSpec.PublicIPName)
 			if iperr != nil {