From 466b9099bd30ec32bde7246b9506d93988a81d4f Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Thu, 20 Apr 2023 20:09:19 +0300
Subject: [PATCH] :zap: Ignore the Kubernetes version check in certain commands
 while creating the Kubernetes provider

---
 cmd/cleanRunner.go |  2 +-
 cmd/common.go      | 20 +++++++++++---------
 cmd/logs.go        |  2 +-
 cmd/manifests.go   |  2 +-
 cmd/proxyRunner.go |  2 +-
 cmd/tapRunner.go   |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/cmd/cleanRunner.go b/cmd/cleanRunner.go
index cb019e980..2712f865d 100644
--- a/cmd/cleanRunner.go
+++ b/cmd/cleanRunner.go
@@ -5,7 +5,7 @@ import (
 )
 
 func performCleanCommand() {
-	kubernetesProvider, err := getKubernetesProviderForCli(false)
+	kubernetesProvider, err := getKubernetesProviderForCli(false, false)
 	if err != nil {
 		return
 	}
diff --git a/cmd/common.go b/cmd/common.go
index 796c95991..38e3d1ef6 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -58,7 +58,7 @@ func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx con
 	}
 }
 
-func getKubernetesProviderForCli(silent bool) (*kubernetes.Provider, error) {
+func getKubernetesProviderForCli(silent bool, dontCheckVersion bool) (*kubernetes.Provider, error) {
 	kubeConfigPath := config.Config.KubeConfigPath()
 	kubernetesProvider, err := kubernetes.NewProvider(kubeConfigPath, config.Config.Kube.Context)
 	if err != nil {
@@ -75,15 +75,17 @@ func getKubernetesProviderForCli(silent bool) (*kubernetes.Provider, error) {
 		return nil, err
 	}
 
-	kubernetesVersion, err := kubernetesProvider.GetKubernetesVersion()
-	if err != nil {
-		handleKubernetesProviderError(err)
-		return nil, err
-	}
+	if !dontCheckVersion {
+		kubernetesVersion, err := kubernetesProvider.GetKubernetesVersion()
+		if err != nil {
+			handleKubernetesProviderError(err)
+			return nil, err
+		}
 
-	if err := kubernetes.ValidateKubernetesVersion(kubernetesVersion); err != nil {
-		handleKubernetesProviderError(err)
-		return nil, err
+		if err := kubernetes.ValidateKubernetesVersion(kubernetesVersion); err != nil {
+			handleKubernetesProviderError(err)
+			return nil, err
+		}
 	}
 
 	return kubernetesProvider, nil
diff --git a/cmd/logs.go b/cmd/logs.go
index 3ac774c0e..42e63cf05 100644
--- a/cmd/logs.go
+++ b/cmd/logs.go
@@ -18,7 +18,7 @@ var logsCmd = &cobra.Command{
 	Use:   "logs",
 	Short: "Create a ZIP file with logs for GitHub issues or troubleshooting",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		kubernetesProvider, err := getKubernetesProviderForCli(false)
+		kubernetesProvider, err := getKubernetesProviderForCli(false, false)
 		if err != nil {
 			return nil
 		}
diff --git a/cmd/manifests.go b/cmd/manifests.go
index 1f6ff5c93..e1944190f 100644
--- a/cmd/manifests.go
+++ b/cmd/manifests.go
@@ -104,7 +104,7 @@ func generateManifests() (
 	err error,
 ) {
 	var kubernetesProvider *kubernetes.Provider
-	kubernetesProvider, err = getKubernetesProviderForCli(true)
+	kubernetesProvider, err = getKubernetesProviderForCli(true, true)
 	if err != nil {
 		return
 	}
diff --git a/cmd/proxyRunner.go b/cmd/proxyRunner.go
index c5d55a2a9..4ec473426 100644
--- a/cmd/proxyRunner.go
+++ b/cmd/proxyRunner.go
@@ -15,7 +15,7 @@ import (
 )
 
 func runProxy(block bool, noBrowser bool) {
-	kubernetesProvider, err := getKubernetesProviderForCli(false)
+	kubernetesProvider, err := getKubernetesProviderForCli(false, false)
 	if err != nil {
 		return
 	}
diff --git a/cmd/tapRunner.go b/cmd/tapRunner.go
index 68237ce9d..b603bb252 100644
--- a/cmd/tapRunner.go
+++ b/cmd/tapRunner.go
@@ -62,7 +62,7 @@ func tap() {
 
 	connector = connect.NewConnector(kubernetes.GetLocalhostOnPort(config.Config.Tap.Proxy.Hub.SrcPort), connect.DefaultRetries, connect.DefaultTimeout)
 
-	kubernetesProvider, err := getKubernetesProviderForCli(false)
+	kubernetesProvider, err := getKubernetesProviderForCli(false, false)
 	if err != nil {
 		return
 	}