Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: code-review-assist[bot] <182814678+code-review-assist[bot]@users.noreply.github.com>
  • Loading branch information
idsulik and code-review-assist[bot] authored Dec 20, 2024
1 parent 14e6179 commit 3fdec62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions pkg/skaffold/deploy/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ func (h *Deployer) Deploy(ctx context.Context, out io.Writer, builds []graph.Art

olog.Entry(ctx).Infof("Deploying with helm v%s ...", h.bV)

// Build dependency graph
// Build dependency graph to determine the order of Helm release deployments.
dependencyGraph, err := BuildDependencyGraph(h.Releases)
dependencyGraph, err := BuildDependencyGraph(h.Releases)
if err != nil {
return fmt.Errorf("error building dependency graph: %w", err)
Expand All @@ -282,7 +283,8 @@ func (h *Deployer) Deploy(ctx context.Context, out io.Writer, builds []graph.Art
nsMap := map[string]struct{}{}
manifests := manifest.ManifestList{}

// Group releases by their dependency level
// Group releases by their dependency level to deploy them in the correct order.
levelGroups := groupReleasesByLevel(deploymentOrder, dependencyGraph)
levelGroups := groupReleasesByLevel(deploymentOrder, dependencyGraph)

g, levelCtx := errgroup.WithContext(ctx)
Expand Down Expand Up @@ -698,7 +700,8 @@ func (h *Deployer) warnAboutUnusedImages(builds []graph.Artifact, manifests mani
}
}

// calculateDeploymentOrder returns a topologically sorted list of releases
// calculateDeploymentOrder returns a topologically sorted list of releases,
// ensuring that releases are deployed after their dependencies.
func calculateDeploymentOrder(graph map[string][]string) ([]string, error) {
visited := make(map[string]bool)
var order []string
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/schema/latest/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ type HelmRelease struct {
// Packaged parameters for packaging helm chart (`helm package`).
Packaged *HelmPackaged `yaml:"packaged,omitempty"`

// DependsOn is a list of Helm releases that this deploy depends on.
// DependsOn is a list of Helm release names that this deploy depends on.
DependsOn []string `yaml:"dependsOn,omitempty"`
}

Expand Down

0 comments on commit 3fdec62

Please sign in to comment.