Merge pull request #34 from navilg/32-not-printing-proper-error-messa…

…ge-if-no-kubeconfig-file-or-kubeconfig-env-variable-found-with-kubectl-auto fix #32: Not printing proper error message if no .kube/config file or KUBECONFIG env variable found with kubectl auto
navilg · Nov 2, 2024 · cdf24db · cdf24db
2 parents bdb42ad + d038ab7
commit cdf24db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/internal/ikubernetes/version.go b/internal/ikubernetes/version.go
@@ -3,7 +3,6 @@ package ikubernetes
 import (
 	"context"
 	"errors"
-	"log"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -37,12 +36,12 @@ func GetK8sVersion() (*string, error) {
 
 	clientset, err := kubernetes.NewForConfig(kubeconfig)
 	if err != nil {
-		log.Fatalf("Error setting up K8s client")
+		return nil, err
 	}
 
 	k8sVersion, err := clientset.ServerVersion()
 	if err != nil {
-		log.Fatalf("Error getting K8s server version: %v", err)
+		return nil, err
 	}
 
 	k8sSemversion := k8sVersion.String()
@@ -72,15 +71,15 @@ func GetVeleroVersion() (*string, error) {
 
 	clientset, err := kubernetes.NewForConfig(kubeconfig)
 	if err != nil {
-		log.Fatalf("Error setting up K8s client")
+		return nil, err
 	}
 
 	namespace := "velero"
 	deploymentName := "velero"
 
 	deployment, err := clientset.AppsV1().Deployments(namespace).Get(context.TODO(), deploymentName, metav1.GetOptions{})
 	if err != nil {
-		return nil, errors.New("Error retrieving velero deployment from velero namespace")
+		return nil, errors.New("error retrieving velero deployment from velero namespace")
 	}
 
 	veleroImageName := deployment.Spec.Template.Spec.Containers[0].Image
@@ -90,7 +89,7 @@ func GetVeleroVersion() (*string, error) {
 	semVersionRegex := regexp.MustCompile(`^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z-.]+))?(?:\+([0-9A-Za-z-.]+))?$`)
 
 	if !semVersionRegex.MatchString(veleroVersion) {
-		return nil, errors.New("Velero image used in velero deployment is not semantic version: " + veleroVersion)
+		return nil, errors.New("velero image used in velero deployment is not semantic version: " + veleroVersion)
 	}
 
 	return &veleroVersion, nil

diff --git a/internal/install/install.go b/internal/install/install.go
@@ -71,7 +71,7 @@ func InstallKubectl(version string, overwrite bool, timeout int, proxy string) e
 		fmt.Println("Fetching Kubernetes server version")
 		k8sVersion, err := ikubernetes.GetK8sVersion()
 		if err != nil {
-			fmt.Println("Error getting Kubernetes server version")
+			fmt.Println("Error getting Kubernetes server version. Error:", err.Error())
 			return err
 		}
 		version = *k8sVersion

diff --git a/internal/use/use.go b/internal/use/use.go
@@ -24,7 +24,7 @@ func UseVersion(toolname, version string) error {
 		fmt.Println("Fetching Kubernetes server version")
 		k8sVersion, err := ikubernetes.GetK8sVersion()
 		if err != nil {
-			fmt.Println("Error getting Kubernetes server version")
+			fmt.Println("Error getting Kubernetes server version. Error:", err.Error())
 			return err
 		}
 		version = *k8sVersion