delete pod on test timeout (#256)

* move defer func

* bump

* added upper boundary to kube version

* removed print

Author: rotem-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.234
+VERSION=v0.0.235
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

@@ -848,7 +848,7 @@ func preInstallationChecks(ctx context.Context, opts *RuntimeInstallOptions) err
 
 	if !opts.SkipClusterChecks {
 		err = util.RunNetworkTest(ctx, opts.KubeFactory, cfConfig.GetCurrentContext().URL)
-		if err != nil {
+		if err == nil {
 			log.G(ctx).Info("Network test finished successfully")
 		}
 	}

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.234/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.235/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.234/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.235/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
     namespace: '{{ namespace }}'
 spec:
   defVersion: 1.0.0
-  version: 0.0.234
+  version: 0.0.235
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/store/store.go

@@ -136,6 +136,7 @@ type Store struct {
 	NetworkTesterGenerateName            string
 	NetworkTesterImage                   string
 	MinKubeVersion                       string
+	MaxKubeVersion                       string
 }
 
 // Get returns the global store
@@ -228,6 +229,7 @@ func init() {
 	s.NetworkTesterGenerateName = "cf-network-tester-"
 	s.NetworkTesterImage = "quay.io/codefresh/cf-venona-network-tester:latest"
 	s.MinKubeVersion = "v1.18.0"
+	s.MaxKubeVersion = "v1.21.9"
 
 	initVersion()
 }

pkg/util/kube/kube.go

@@ -69,10 +69,11 @@ func EnsureClusterRequirements(ctx context.Context, kubeFactory kube.Factory, na
 		return fmt.Errorf("failed to check the cluster's version: %w", err)
 	}
 
-	delta := version.CompareKubeAwareVersionStrings(store.Get().MinKubeVersion, kubeVersion.String())
+	minDelta := version.CompareKubeAwareVersionStrings(store.Get().MinKubeVersion, kubeVersion.String())
+	maxDelta := version.CompareKubeAwareVersionStrings(store.Get().MaxKubeVersion, kubeVersion.String())
 
-	if delta < 0 {
-		return fmt.Errorf("%s: cluster's server version must be %s or higher", requirementsValidationErrorMessage, store.Get().MinKubeVersion)
+	if minDelta < 0 || maxDelta > 0 {
+		return fmt.Errorf("%s: cluster's server version must be between %s and %s", requirementsValidationErrorMessage, store.Get().MinKubeVersion, store.Get().MaxKubeVersion)
 	}
 
 	req := validationRequest{

pkg/util/util.go

@@ -236,6 +236,13 @@ func RunNetworkTest(ctx context.Context, kubeFactory kube.Factory, urls ...strin
 		}
 	}()
 
+	defer func(name *string) {
+		deferErr := client.CoreV1().Pods(store.Get().DefaultNamespace).Delete(ctx, *name, metav1.DeleteOptions{})
+		if deferErr != nil {
+			log.G(ctx).Error("fail to delete tester pod '%s': %s", testerPodName, deferErr.Error())
+		}
+	}(&testerPodName)
+
 	log.G(ctx).Info("Running network test...")
 
 	ticker := time.NewTicker(5 * time.Second)
@@ -283,15 +290,8 @@ Loop:
 			return fmt.Errorf("network test timeout reached!")
 		}
 	}
-
-	defer func() {
-		deferErr := client.CoreV1().Pods(store.Get().DefaultNamespace).Delete(ctx, testerPodName, metav1.DeleteOptions{})
-		if deferErr != nil {
-			log.G(ctx).Error("fail to delete tester pod '%s': %s", testerPodName, deferErr.Error())
-		}
-	}()
 
-	return checkPodLastState(ctx, client, testerPodName,podLastState)
+	return checkPodLastState(ctx, client, testerPodName, podLastState)
 }
 
 func prepareEnvVars(vars map[string]string) []v1.EnvVar {