Merge pull request #3186 from DiptoChakrabarty/errwrap

Use Wrapf for errors only when err is not nil

Author: k8s-ci-robot

pkg/cloud/services/eks/fargate.go

@@ -104,7 +104,7 @@ func (s *FargateService) reconcileFargateProfile() (requeue bool, err error) {
 		tagKey := infrav1.ClusterAWSCloudProviderTagKey(s.scope.ClusterName())
 		ownedTag := profile.Tags[tagKey]
 		if ownedTag == nil {
-			return false, errors.Wrapf(err, "owned tag not found for this cluster")
+			return false, errors.New("owned tag not found for this cluster")
 		}
 		s.scope.V(2).Info("Found owned EKS fargate profile", "cluster-name", eksClusterName, "profile-name", profileName)
 	}

pkg/cloud/services/eks/nodegroup.go

@@ -484,7 +484,7 @@ func (s *NodegroupService) reconcileNodegroup() error {
 		tagKey := infrav1.ClusterAWSCloudProviderTagKey(s.scope.ClusterName())
 		ownedTag := ng.Tags[tagKey]
 		if ownedTag == nil {
-			return errors.Wrapf(err, "owner of %s mismatch: %s", eksNodegroupName, s.scope.ClusterName())
+			return errors.Errorf("owner of %s mismatch: %s", eksNodegroupName, s.scope.ClusterName())
 		}
 		s.scope.V(2).Info("Found owned EKS nodegroup in AWS", "cluster-name", eksClusterName, "nodegroup-name", eksNodegroupName)
 	}

pkg/cloud/services/network/natgateways.go

@@ -287,7 +287,7 @@ func (s *Service) deleteNatGateway(id string) error {
 		}
 
 		if len(out.NatGateways) == 0 {
-			return false, errors.Wrapf(err, "no NAT gateway returned for id %q", id)
+			return false, errors.New(fmt.Sprintf("no NAT gateway returned for id %q", id))
 		}
 
 		ng := out.NatGateways[0]