Switch Pod and Job await logic to external lib (#1856)

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## HEAD (Unreleased)
+
 - Fix panic for deletions from virtual fields in Helm Release (https://github.com/pulumi/pulumi-kubernetes/pull/1850)
+- Switch Pod and Job await logic to external lib (https://github.com/pulumi/pulumi-kubernetes/pull/1856)
 - Upgrade kubernetes provider module deps (https://github.com/pulumi/pulumi-kubernetes/pull/1861)
 
 ## 3.13.0 (January 7, 2022)

provider/pkg/await/deployment.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/pkg/errors"
 	checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging"
+	checkpod "github.com/pulumi/cloud-ready-checks/pkg/kubernetes/pod"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers"
-	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata"
@@ -806,14 +806,14 @@ func (dia *deploymentInitAwaiter) aggregatePodErrors() checkerlog.Messages {
 		}
 
 		// Check the pod for errors.
-		checker := states.NewPodChecker()
+		checker := checkpod.NewPodChecker()
 		pod, err := clients.PodFromUnstructured(unstructuredPod)
 		if err != nil {
 			logger.V(3).Infof("Failed to unmarshal Pod event: %v", err)
 			return nil
 		}
-		m := checker.Update(pod)
-		messages = append(messages, m.MessagesWithSeverity(diag.Warning, diag.Error)...)
+		_, results := checker.ReadyDetails(pod)
+		messages = append(messages, results.Messages().MessagesWithSeverity(diag.Warning, diag.Error)...)
 	}
 
 	return messages

provider/pkg/await/job.go

@@ -20,9 +20,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/pulumi/cloud-ready-checks/pkg/checker"
 	checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging"
+	"github.com/pulumi/cloud-ready-checks/pkg/kubernetes/job"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers"
-	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging"
@@ -82,16 +83,17 @@ const (
 type jobInitAwaiter struct {
 	job      *unstructured.Unstructured
 	config   createAwaitConfig
-	state    *states.StateChecker
+	checker  *checker.StateChecker
 	errors   logging.TimeOrderedLogSet
 	resource ResourceID
+	ready    bool
 }
 
 func makeJobInitAwaiter(c createAwaitConfig) *jobInitAwaiter {
 	return &jobInitAwaiter{
 		config:   c,
 		job:      c.currentOutputs,
-		state:    states.NewJobChecker(),
+		checker:  job.NewJobChecker(),
 		resource: ResourceIDFromUnstructured(c.currentOutputs),
 	}
 }
@@ -124,7 +126,7 @@ func (jia *jobInitAwaiter) Await() error {
 
 	timeout := metadata.TimeoutDuration(jia.config.timeout, jia.config.currentInputs, DefaultJobTimeoutMins*60)
 	for {
-		if jia.state.Ready() {
+		if jia.ready {
 			return nil
 		}
 
@@ -176,7 +178,7 @@ func (jia *jobInitAwaiter) Read() error {
 	_ = jia.processJobEvent(watchAddedEvent(job))
 
 	// Check whether we've succeeded.
-	if jia.state.Ready() {
+	if jia.ready {
 		return nil
 	}
 
@@ -215,7 +217,9 @@ func (jia *jobInitAwaiter) processJobEvent(event watch.Event) error {
 		return nil
 	}
 
-	messages := jia.state.Update(job)
+	var results checker.Results
+	jia.ready, results = jia.checker.ReadyDetails(job)
+	messages := results.Messages()
 	for _, message := range messages.MessagesWithSeverity(diag.Warning, diag.Error) {
 		jia.errors.Add(message)
 	}

provider/pkg/await/pod.go

@@ -19,9 +19,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/pulumi/cloud-ready-checks/pkg/checker"
 	"github.com/pulumi/cloud-ready-checks/pkg/checker/logging"
+	"github.com/pulumi/cloud-ready-checks/pkg/kubernetes/pod"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers"
-	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds"
 	"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata"
@@ -107,15 +108,16 @@ const (
 type podInitAwaiter struct {
 	pod      *unstructured.Unstructured
 	config   createAwaitConfig
-	state    *states.StateChecker
+	checker  *checker.StateChecker
+	ready    bool
 	messages logging.Messages
 }
 
 func makePodInitAwaiter(c createAwaitConfig) *podInitAwaiter {
 	return &podInitAwaiter{
-		config: c,
-		pod:    c.currentOutputs,
-		state:  states.NewPodChecker(),
+		config:  c,
+		pod:     c.currentOutputs,
+		checker: pod.NewPodChecker(),
 	}
 }
 
@@ -160,7 +162,7 @@ func (pia *podInitAwaiter) Await() error {
 
 	timeout := metadata.TimeoutDuration(pia.config.timeout, pia.config.currentInputs, DefaultPodTimeoutMins*60)
 	for {
-		if pia.state.Ready() {
+		if pia.ready {
 			return nil
 		}
 
@@ -202,7 +204,7 @@ func (pia *podInitAwaiter) Read() error {
 	pia.processPodEvent(watchAddedEvent(pod))
 
 	// Check whether we've succeeded.
-	if pia.state.Ready() {
+	if pia.ready {
 		return nil
 	}
 
@@ -228,7 +230,9 @@ func (pia *podInitAwaiter) processPodEvent(event watch.Event) {
 		return
 	}
 
-	pia.messages = pia.state.Update(pod)
+	var results checker.Results
+	pia.ready, results = pia.checker.ReadyDetails(pod)
+	pia.messages = results.Messages()
 	for _, message := range pia.messages {
 		pia.config.logMessage(message)
 	}