Revert_to_job (#281)

* reverted back to network-tester job

Author: ATGardner

CHANGELOG.md

@@ -1,4 +1,3 @@
 # Changelog:
 
-* Create git integration and user PAT even when installation check times out
-* Replace pre-install network check Job with a simple Pod
+* Reverted pre-install network check to Job

Makefile

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

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.256/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.257/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.256/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.257/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.1
-  version: 0.0.256
+  version: 0.0.257
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/util/kube/kube.go

@@ -24,6 +24,7 @@ import (
 	"github.com/argoproj-labs/argocd-autopilot/pkg/kube"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	authv1 "k8s.io/api/authorization/v1"
+	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -54,13 +55,6 @@ type (
 		RestartPolicy v1.RestartPolicy
 		BackOffLimit  int32
 	}
-
-	RunPodOptions struct {
-		Namespace    string
-		GenerateName string
-		Image        string
-		Env          []v1.EnvVar
-	}
 )
 
 func EnsureClusterRequirements(ctx context.Context, kubeFactory kube.Factory, namespace string) error {
@@ -235,24 +229,61 @@ func testNode(n v1.Node, req validationRequest) []string {
 	return result
 }
 
-func RunPod(ctx context.Context, client kubernetes.Interface, opts RunPodOptions) (*v1.Pod, error) {
-	podSpec := &v1.Pod{
+func LaunchJob(ctx context.Context, client kubernetes.Interface, opts LaunchJobOptions) (*batchv1.Job, error) {
+	jobSpec := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:    opts.Namespace,
-			GenerateName: opts.GenerateName,
+			Name:      *opts.JobName,
+			Namespace: opts.Namespace,
 		},
-		Spec: v1.PodSpec{
-			Containers: []v1.Container{
-				{
-					Name:  opts.GenerateName,
-					Image: opts.Image,
-					Env:   opts.Env,
+		Spec: batchv1.JobSpec{
+			Template: v1.PodTemplateSpec{
+				Spec: v1.PodSpec{
+					Containers: []v1.Container{
+						{
+							Name:  *opts.JobName,
+							Image: *opts.Image,
+							Env:   opts.Env,
+						},
+					},
+					RestartPolicy: opts.RestartPolicy,
 				},
 			},
+			BackoffLimit: &opts.BackOffLimit,
 		},
 	}
 
-	return client.CoreV1().Pods(opts.Namespace).Create(ctx, podSpec, metav1.CreateOptions{})
+	return client.BatchV1().Jobs(opts.Namespace).Create(ctx, jobSpec, metav1.CreateOptions{})
+}
+
+func DeleteJob(ctx context.Context, client kubernetes.Interface, job *batchv1.Job) error {
+	err := client.BatchV1().Jobs(job.Namespace).Delete(ctx, job.Name, metav1.DeleteOptions{})
+	if err != nil {
+		return fmt.Errorf("fail to delete job resource \"%s\": %s", job.Name, err.Error())
+	}
+
+	err = client.CoreV1().Pods(job.Namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{
+		LabelSelector: "controller-uid=" + job.GetLabels()["controller-uid"],
+	})
+	if err != nil {
+		return fmt.Errorf("fail to delete tester pod: %s", err.Error())
+	}
+
+	return nil
+}
+
+func GetPodByJob(ctx context.Context, client kubernetes.Interface, job *batchv1.Job) (*v1.Pod, error) {
+	pods, err := client.CoreV1().Pods(store.Get().DefaultNamespace).List(ctx, metav1.ListOptions{
+		LabelSelector: "controller-uid=" + job.GetLabels()["controller-uid"],
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if len(pods.Items) == 0 {
+		return nil, nil
+	}
+
+	return &pods.Items[0], nil
 }
 
 func GetPodLogs(ctx context.Context, client kubernetes.Interface, namespace, name string) (string, error) {

pkg/util/util.go

@@ -30,7 +30,6 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/reporter"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	kubeutil "github.com/codefresh-io/cli-v2/pkg/util/kube"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
@@ -212,24 +211,26 @@ func RunNetworkTest(ctx context.Context, kubeFactory kube.Factory, urls ...strin
 		return fmt.Errorf("failed to create kubernetes client: %w", err)
 	}
 
-	pod, err := kubeutil.RunPod(ctx, client, kubeutil.RunPodOptions{
-		Namespace:    store.Get().DefaultNamespace,
-		GenerateName: store.Get().NetworkTesterName,
-		Image:        store.Get().NetworkTesterImage,
-		Env:          env,
+	job, err := kubeutil.LaunchJob(ctx, client, kubeutil.LaunchJobOptions{
+		Namespace:     store.Get().DefaultNamespace,
+		JobName:       &store.Get().NetworkTesterName,
+		Image:         &store.Get().NetworkTesterImage,
+		Env:           env,
+		RestartPolicy: v1.RestartPolicyNever,
+		BackOffLimit:  0,
 	})
 	if err != nil {
 		return err
 	}
+
 	defer func() {
-		err = client.CoreV1().Pods(store.Get().DefaultNamespace).Delete(ctx, pod.Name, metav1.DeleteOptions{})
+		err := kubeutil.DeleteJob(ctx, client, job)
 		if err != nil {
 			log.G(ctx).Errorf("fail to delete tester pod: %s", err.Error())
 		}
 	}()
 
 	log.G(ctx).Info("Running network test...")
-
 	ticker := time.NewTicker(5 * time.Second)
 	defer ticker.Stop()
 	var podLastState *v1.Pod
@@ -240,11 +241,16 @@ Loop:
 		select {
 		case <-ticker.C:
 			log.G(ctx).Debug("Waiting for network tester to finish")
-			currentPod, err := client.CoreV1().Pods(store.Get().DefaultNamespace).Get(ctx, pod.Name, metav1.GetOptions{})
+			currentPod, err := kubeutil.GetPodByJob(ctx, client, job)
 			if err != nil {
 				return err
 			}
 
+			if currentPod == nil {
+				log.G(ctx).Debug("Network tester pod: waiting for pod")
+				continue
+			}
+
 			if len(currentPod.Status.ContainerStatuses) == 0 {
 				log.G(ctx).Debug("Network tester pod: creating container")
 				continue