Skip to content

Commit

Permalink
Merge pull request #2785 from weaveworks/merge-4b71b6c881b8b252829dd2…
Browse files Browse the repository at this point in the history
…f133eedc151dd7fd4d

Enforce control plane readiness before checking core-dns with fargate
  • Loading branch information
michaelbeaumont committed Oct 29, 2020
2 parents c0cfa68 + 4394ee8 commit 2a80169
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkg/eks/fargate.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ func (fpt *fargateProfilesTask) Do(errCh chan error) error {
if err := DoCreateFargateProfiles(fpt.spec, fpt.clusterProvider); err != nil {
return err
}
// Make sure control plane is reachable
clientSet, err := fpt.clusterProvider.NewStdClientSet(fpt.spec)
if err != nil {
return err
return errors.Wrap(err, "failed to get ClientSet")
}
if err := fpt.clusterProvider.WaitForControlPlane(fpt.spec.Metadata, clientSet); err != nil {
return errors.Wrap(err, "failed to wait for control plane")
}
if err := ScheduleCoreDNSOnFargateIfRelevant(fpt.spec, fpt.clusterProvider, clientSet); err != nil {
return err
return errors.Wrap(err, "failed to schedule core-dns on fargate")
}
return nil
}
Expand Down

0 comments on commit 2a80169

Please sign in to comment.