Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cli/command/stack/kubernetes/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
runtimeutil "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch"
cache "k8s.io/client-go/tools/cache"
podutils "k8s.io/kubernetes/pkg/api/v1/pod"
)

type stackListWatch interface {
Expand Down Expand Up @@ -157,7 +156,7 @@ func (pw *podWatcher) updateServiceStatus(serviceName string) {
case apiv1.PodUnknown:
status.podsUnknown++
}
if podutils.IsPodReady(pod) {
if pw.isPodReady(pod) {
status.podsReady++
}
}
Expand All @@ -170,6 +169,15 @@ func (pw *podWatcher) updateServiceStatus(serviceName string) {
pw.services[serviceName] = status
}

func (pw *podWatcher) isPodReady(pod *apiv1.Pod) bool {
for _, condition := range pod.Status.Conditions {
if condition.Status == apiv1.ConditionTrue && condition.Type == apiv1.PodReady {
return true
}
}
return false
}

func (pw *podWatcher) allReady() bool {
for _, status := range pw.services {
if status.podsReady == 0 {
Expand Down
4 changes: 0 additions & 4 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,9 @@ gopkg.in/yaml.v2 53403b58ad1b561927d19068c655
gotest.tools/v3 bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 # v3.0.2
k8s.io/api d49a3f108dab8e8d25f22c497fb48678b124efd2 # v0.16.9
k8s.io/apimachinery f336d9be0221d10a93a7d6d2ec25f6fc799f4fc6 # v0.16.9
k8s.io/apiextensions-apiserver e0288c14e6fda28eefbd584da8c657447e414f96 # v0.16.9
k8s.io/apiserver 3987e0d46aec47186e5f2c0d61ad84975cb79bd8 # v0.16.9
k8s.io/client-go 002560d5bf54049bf5b5ae99231cb2b591f15954 # v0.16.9
k8s.io/component-base dbd90d7c5d87d80fd674cc40d69ca7b14798eda5 # v0.16.9
k8s.io/klog 4ad0115ba9e45c096d06a31d8dfb0e5bd945ec5f # v1.0.0-2-g4ad0115 pending v1.0.1 release to fix https://github.com/docker/cli/issues/2420
k8s.io/kube-openapi 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4
k8s.io/kubernetes a17149e1a189050796ced469dbd78d380f2ed5ef # v1.16.9
k8s.io/utils 69764acb6e8e900b7c05296c5d3c9c19545475f9
sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0

Expand Down
202 changes: 0 additions & 202 deletions vendor/k8s.io/apiextensions-apiserver/LICENSE

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/k8s.io/apiextensions-apiserver/README.md

This file was deleted.

45 changes: 0 additions & 45 deletions vendor/k8s.io/apiextensions-apiserver/go.mod

This file was deleted.

Loading