Skip to content

Commit

Permalink
Reorder stack resources creation order (#1534)
Browse files Browse the repository at this point in the history
Signed-off-by: Javier López Barba <javier@okteto.com>
  • Loading branch information
jLopezbarb committed May 18, 2021
1 parent c585f14 commit 2b81e10
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions pkg/cmd/stack/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ func deploy(ctx context.Context, s *model.Stack, wait bool, c *kubernetes.Client

addHiddenExposedPorts(ctx, s)

for name := range s.Services {
if len(s.Services[name].Ports) > 0 {
svcK8s := translateService(name, s)
if err := services.Deploy(ctx, svcK8s, c); err != nil {
return err
}
}
}

for name := range s.Volumes {
if err := deployVolume(ctx, name, s, c); err != nil {
return err
Expand All @@ -96,6 +105,7 @@ func deploy(ctx context.Context, s *model.Stack, wait bool, c *kubernetes.Client
log.Success("Created volume '%s'", name)
spinner.Start()
}

for name := range s.Services {
if len(s.Services[name].Volumes) == 0 {
if err := deployDeployment(ctx, name, s, c); err != nil {
Expand All @@ -106,13 +116,6 @@ func deploy(ctx context.Context, s *model.Stack, wait bool, c *kubernetes.Client
return err
}
}
if len(s.Services[name].Ports) > 0 {
svcK8s := translateService(name, s)
if err := services.Deploy(ctx, svcK8s, c); err != nil {
return err
}
}

spinner.Stop()
log.Success("Deployed service '%s'", name)
spinner.Start()
Expand Down

0 comments on commit 2b81e10

Please sign in to comment.