CR-14419-add-cluster-logs (#559)

* show logs + return error

* bump

* updated version to 0.0.502

Author: ATGardner

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.501
+VERSION=v0.0.502
 
 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.501/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.502/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.501/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.502/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.501
+  version: 0.0.502
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/util/kube/kube.go

@@ -218,9 +218,10 @@ func GetClusterSecret(ctx context.Context, kubeFactory kube.Factory, namespace s
 
 func WaitForJob(ctx context.Context, f kube.Factory, ns, jobName string) error {
 	var attempt int32
-	return f.Wait(ctx, &kube.WaitOptions{
-		Interval: time.Second * 10,
-		Timeout:  time.Minute * 11, // BackOffLimit of 6 is a total of 630s, or 10m30s
+	var jobErr error
+	_ = f.Wait(ctx, &kube.WaitOptions{
+		Interval: time.Second * 5,
+		Timeout:  time.Minute,
 		Resources: []kube.Resource{
 			{
 				Name:      jobName,
@@ -236,28 +237,30 @@ func WaitForJob(ctx context.Context, f kube.Factory, ns, jobName string) error {
 						return false, err
 					}
 
+					totalRetries := *j.Spec.BackoffLimit + 1
 					if j.Status.Failed > attempt {
 						attempt = j.Status.Failed
-						log.G(ctx).Warnf("Attempt #%d/%d failed:", attempt, *j.Spec.BackoffLimit)
+						log.G(ctx).Warnf("Attempt #%d/%d failed:", attempt, totalRetries)
 						printJobLogs(ctx, cs, j)
 					} else if j.Status.Succeeded == 1 {
 						attempt += 1
-						log.G(ctx).Infof("Attempt #%d/%d succeeded:", attempt, *j.Spec.BackoffLimit)
+						log.G(ctx).Infof("Attempt #%d/%d succeeded:", attempt, totalRetries)
 						printJobLogs(ctx, cs, j)
 					}
 
 					for _, cond := range j.Status.Conditions {
 						if cond.Type == batchv1.JobFailed {
-							err = fmt.Errorf("add-cluster-job failed after %d attempts", j.Status.Failed)
+							jobErr = fmt.Errorf("add-cluster-job failed after %d attempt(s)", j.Status.Failed)
 							break
 						}
 					}
 
-					return j.Status.Succeeded == 1 || j.Status.Failed == *j.Spec.BackoffLimit, err
+					return j.Status.Succeeded == 1 || j.Status.Failed == totalRetries, jobErr
 				},
 			},
 		},
 	})
+	return jobErr
 }
 
 func printJobLogs(ctx context.Context, client kubernetes.Interface, job *batchv1.Job) {