Merge pull request #181 from datum-cloud/fix/issue-169

fix: distinguish ErrNotInCluster in probeAPIServer

Author: privateip

internal/cni/cni_test.go

@@ -19,6 +19,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
@@ -1175,3 +1176,43 @@ func TestRetryK8sOpsExhaustsDeadline(t *testing.T) {
 		t.Errorf("expected 'unavailable' in error, got %v", err)
 	}
 }
+
+// ---- probeAPIServer ------------------------------------------------------
+
+func TestProbeAPIServerErrNotInCluster(t *testing.T) {
+	// When getKubeconfig returns ErrNotInCluster, probeAPIServer should
+	// return nil (not running in-cluster; skip API check).
+	original := getKubeconfig
+	defer func() { getKubeconfig = original }()
+
+	getKubeconfig = func() (*rest.Config, error) {
+		return nil, rest.ErrNotInCluster
+	}
+
+	if err := probeAPIServer(); err != nil {
+		t.Fatalf("expected nil for ErrNotInCluster, got %v", err)
+	}
+}
+
+func TestProbeAPIServerMalformedKubeconfig(t *testing.T) {
+	// When getKubeconfig returns a non-ErrNotInCluster error (e.g. a
+	// malformed kubeconfig file), probeAPIServer should surface it wrapped.
+	original := getKubeconfig
+	defer func() { getKubeconfig = original }()
+
+	malformedErr := errors.New("invalid kubeconfig: permission denied")
+	getKubeconfig = func() (*rest.Config, error) {
+		return nil, malformedErr
+	}
+
+	err := probeAPIServer()
+	if err == nil {
+		t.Fatal("expected error for malformed kubeconfig, got nil")
+	}
+	if !strings.Contains(err.Error(), "load kubeconfig") {
+		t.Fatalf("error %q does not contain 'load kubeconfig'", err.Error())
+	}
+	if !strings.Contains(err.Error(), "permission denied") {
+		t.Fatalf("error %q does not contain original error", err.Error())
+	}
+}

internal/cni/ops_check.go

@@ -102,11 +102,18 @@ func cmdStatus(args *skel.CmdArgs) error {
 // probeAPIServer performs a lightweight GET against the in-cluster API server
 // to verify reachability. Returns nil when the server responds (any HTTP
 // status code) or when running outside a cluster with no kubeconfig.
+//
+// getKubeconfig is a package-level variable so tests can inject error paths.
+var getKubeconfig = func() (*rest.Config, error) { return ctrl.GetConfig() }
+
 func probeAPIServer() error {
-	kubeconfig, err := ctrl.GetConfig()
+	kubeconfig, err := getKubeconfig()
 	if err != nil {
-		// No kubeconfig (running outside a cluster); skip API check.
-		return nil
+		if errors.Is(err, rest.ErrNotInCluster) {
+			// Not running in-cluster; skip API check.
+			return nil
+		}
+		return fmt.Errorf("load kubeconfig: %w", err)
 	}
 	kubeconfig.Timeout = 2 * time.Second
 	httpClient, err := rest.HTTPClientFor(kubeconfig)