Skip to content

start: wait until pods ready #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sttts merged 1 commit into from
Nov 28, 2018
Merged

start: wait until pods ready #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/cluster-bootstrap/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func init() {
cmdStart.Flags().StringVar(&startOpts.assetDir, "asset-dir", "", "Path to the cluster asset directory.")
cmdStart.Flags().StringVar(&startOpts.podManifestPath, "pod-manifest-path", "/etc/kubernetes/manifests", "The location where the kubelet is configured to look for static pod manifests.")
cmdStart.Flags().BoolVar(&startOpts.strict, "strict", false, "Strict mode will cause start command to exit early if any manifests in the asset directory cannot be created.")
cmdStart.Flags().StringSliceVar(&startOpts.requiredPods, "required-pods", defaultRequiredPods, "List of pods with their namespace (written as <namespace>/<pod-name>) that are required to be running before the start command does the pivot.")
cmdStart.Flags().StringSliceVar(&startOpts.requiredPods, "required-pods", defaultRequiredPods, "List of pods with their namespace (written as <namespace>/<pod-name>) that are required to be running and ready before the start command does the pivot.")
}

func runCmdStart(cmd *cobra.Command, args []string) error {
Expand Down
55 changes: 39 additions & 16 deletions pkg/start/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,14 @@ import (
"k8s.io/client-go/tools/clientcmd"
)

const (
doesNotExist = "DoesNotExist"
)

func WaitUntilPodsRunning(c clientcmd.ClientConfig, pods []string, timeout time.Duration) error {
sc, err := NewStatusController(c, pods)
if err != nil {
return err
}
sc.Run()

if err := wait.Poll(5*time.Second, timeout, sc.AllRunning); err != nil {
if err := wait.Poll(5*time.Second, timeout, sc.AllRunningAndReady); err != nil {
return fmt.Errorf("error while checking pod status: %v", err)
}

Expand All @@ -40,7 +36,7 @@ type statusController struct {
client kubernetes.Interface
podStore cache.Store
watchPods []string
lastPodPhases map[string]v1.PodPhase
lastPodPhases map[string]*PodStatus
}

func NewStatusController(c clientcmd.ClientConfig, pods []string) (*statusController, error) {
Expand Down Expand Up @@ -78,7 +74,7 @@ func (s *statusController) Run() {
go podController.Run(wait.NeverStop)
}

func (s *statusController) AllRunning() (bool, error) {
func (s *statusController) AllRunningAndReady() (bool, error) {
ps, err := s.PodStatus()
if err != nil {
glog.Infof("Error retriving pod statuses: %v", err)
Expand All @@ -93,20 +89,40 @@ func (s *statusController) AllRunning() (bool, error) {
changed := !reflect.DeepEqual(ps, s.lastPodPhases)
s.lastPodPhases = ps

running := true
runningAndReady := true
for p, s := range ps {
if changed {
UserOutput("\tPod Status:%24s\t%s\n", p, s)
var status string
switch {
case s == nil:
status = "DoesNotExist"
case s.Phase == v1.PodRunning && s.IsReady:
status = "Ready"
case s.Phase == v1.PodRunning && !s.IsReady:
status = "RunningNotReady"
default:
status = string(s.Phase)
}

UserOutput("\tPod Status:%24s\t%s\n", p, status)
}
if s != v1.PodRunning {
running = false
if s == nil || s.Phase != v1.PodRunning || !s.IsReady {
runningAndReady = false
}
}
return running, nil
return runningAndReady, nil
}

func (s *statusController) PodStatus() (map[string]v1.PodPhase, error) {
status := make(map[string]v1.PodPhase)
// PodStatus describes a pod's phase and readiness.
type PodStatus struct {
Phase v1.PodPhase
IsReady bool
}

// PodStatus retrieves the pod status by reading the PodPhase and whether it is ready.
// A non existing pod is represented with nil.
func (s *statusController) PodStatus() (map[string]*PodStatus, error) {
status := make(map[string]*PodStatus)

podNames := s.podStore.ListKeys()
for _, watchedPod := range s.watchPods {
Expand All @@ -122,11 +138,18 @@ func (s *statusController) PodStatus() (map[string]v1.PodPhase, error) {
return nil, err
}
if !exists {
status[watchedPod] = doesNotExist
status[watchedPod] = nil
continue
}
if p, ok := p.(*v1.Pod); ok {
status[watchedPod] = p.Status.Phase
status[watchedPod] = &PodStatus{
Phase: p.Status.Phase,
}
for _, c := range p.Status.Conditions {
if c.Type == v1.PodReady {
status[watchedPod].IsReady = c.Status == v1.ConditionTrue
}
}
}
}
return status, nil
Expand Down