Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
pull/30616/head
Austin Abro 2 years ago committed by Andrea Tartaglia
parent e548672434
commit 7d269faadc
No known key found for this signature in database

@ -26,6 +26,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
batch "k8s.io/api/batch/v1"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -470,7 +471,7 @@ func (hw *HelmWaiter) waitForJob(obj runtime.Object, name string) (bool, error)
// waitForPodSuccess is a helper that waits for a pod to complete. // waitForPodSuccess is a helper that waits for a pod to complete.
// //
// This operates on an event returned from a watcher. // This operates on an event returned from a watcher.
func (c *HelmWaiter) waitForPodSuccess(obj runtime.Object, name string) (bool, error) { func (hw *HelmWaiter) waitForPodSuccess(obj runtime.Object, name string) (bool, error) {
o, ok := obj.(*v1.Pod) o, ok := obj.(*v1.Pod)
if !ok { if !ok {
return true, errors.Errorf("expected %s to be a *v1.Pod, got %T", name, obj) return true, errors.Errorf("expected %s to be a *v1.Pod, got %T", name, obj)
@ -478,14 +479,14 @@ func (c *HelmWaiter) waitForPodSuccess(obj runtime.Object, name string) (bool, e
switch o.Status.Phase { switch o.Status.Phase {
case v1.PodSucceeded: case v1.PodSucceeded:
c.log("Pod %s succeeded", o.Name) hw.log("Pod %s succeeded", o.Name)
return true, nil return true, nil
case v1.PodFailed: case v1.PodFailed:
return true, errors.Errorf("pod %s failed", o.Name) return true, errors.Errorf("pod %s failed", o.Name)
case v1.PodPending: case v1.PodPending:
c.log("Pod %s pending", o.Name) hw.log("Pod %s pending", o.Name)
case v1.PodRunning: case v1.PodRunning:
c.log("Pod %s running", o.Name) hw.log("Pod %s running", o.Name)
} }
return false, nil return false, nil

Loading…
Cancel
Save