From 17d0fabdafef622ae87b101e1b2920df22b1a3e6 Mon Sep 17 00:00:00 2001 From: Itai Spiegel Date: Tue, 18 Feb 2025 06:39:35 +0200 Subject: [PATCH] Make the new vars not public Signed-off-by: Itai Spiegel --- pkg/kube/ready.go | 8 ++++---- pkg/kube/wait.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kube/ready.go b/pkg/kube/ready.go index 3759554c3..959a342f1 100644 --- a/pkg/kube/ready.go +++ b/pkg/kube/ready.go @@ -42,10 +42,10 @@ import ( // ReadyCheckerOption is a function that configures a ReadyChecker. type ReadyCheckerOption func(*ReadyChecker) -var ErrJobFailed = errors.New("job is failed") +var errJobFailed = errors.New("job is failed") -var TerminalErrors = []error{ - ErrJobFailed, +var terminalErrors = []error{ + errJobFailed, } // PausedAsReady returns a ReadyCheckerOption that configures a ReadyChecker @@ -248,7 +248,7 @@ func (c *ReadyChecker) jobReady(job *batchv1.Job) (bool, error) { if job.Status.Failed > *job.Spec.BackoffLimit { c.log("Job is failed: %s/%s", job.GetNamespace(), job.GetName()) // If a job is failed, it can't recover, so throw an error - return false, fmt.Errorf("%w: %s/%s", ErrJobFailed, job.GetNamespace(), job.GetName()) + return false, fmt.Errorf("%w: %s/%s", errJobFailed, job.GetNamespace(), job.GetName()) } if job.Spec.Completions != nil && job.Status.Succeeded < *job.Spec.Completions { c.log("Job is not completed: %s/%s", job.GetNamespace(), job.GetName()) diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index b37715be5..9f0f7630b 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -85,7 +85,7 @@ func (w *waiter) isRetryableError(err error, resource *resource.Info) bool { return false } w.log("Error received when checking status of resource %s. Error: '%s', Resource details: '%s'", resource.Name, err, resource) - for _, terminalError := range TerminalErrors { + for _, terminalError := range terminalErrors { if errors.Is(err, terminalError) { w.log("Retryable error? %t", false) return false