Merge pull request #845 from spectrocloud/error-variable-fix

k8s-ci-robot · web-flow · commit a50832c09e03 · 2023-02-24T00:25:34.000-08:00
Return correct error variable
diff --git a/cloud/services/container/clusters/kubeconfig.go b/cloud/services/container/clusters/kubeconfig.go
@@ -57,7 +57,7 @@ func (s *Service) reconcileKubeconfig(ctx context.Context, cluster *containerpb.
 			cluster,
 			&clusterRef,
 		); createErr != nil {
-			return fmt.Errorf("creating kubeconfig secret: %w", err)
+			return fmt.Errorf("creating kubeconfig secret: %w", createErr)
 		}
 	} else if updateErr := s.updateCAPIKubeconfigSecret(ctx, configSecret); updateErr != nil {
 		return fmt.Errorf("updating kubeconfig secret: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (s Service) reconcileKubeconfig(ctx context.Context, cluster containerpb.`
`57`	`57`	`cluster,`
`58`	`58`	`&clusterRef,`
`59`	`59`	`); createErr != nil {`
`60`		`- return fmt.Errorf("creating kubeconfig secret: %w", err)`
	`60`	`+ return fmt.Errorf("creating kubeconfig secret: %w", createErr)`
`61`	`61`	`}`
`62`	`62`	`} else if updateErr := s.updateCAPIKubeconfigSecret(ctx, configSecret); updateErr != nil {`
`63`	`63`	`return fmt.Errorf("updating kubeconfig secret: %w", err)`