Skip to content

Commit

Permalink
put skaffold overrides at end of arg list (#6080)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarlonGamez authored Jun 28, 2021
1 parent f6985d5 commit e85b2f8
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions pkg/skaffold/deploy/helm/args.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,6 @@ func (h *Deployer) installArgs(r latestV1.HelmRelease, builds []graph.Artifact,
return nil, err
}

if len(r.Overrides.Values) != 0 {
args = append(args, "-f", constants.HelmOverridesFilename)
}

for k, v := range params {
var value string

Expand All @@ -198,6 +194,10 @@ func (h *Deployer) installArgs(r latestV1.HelmRelease, builds []graph.Artifact,
return nil, err
}

if len(r.Overrides.Values) != 0 {
args = append(args, "-f", constants.HelmOverridesFilename)
}

if r.Wait {
args = append(args, "--wait")
}
Expand Down
Loading

0 comments on commit e85b2f8

Please sign in to comment.