Skip to content
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

Jump to bottom

helm deployer: Remove duplication #3469

Merged
merged 1 commit into from
Jan 7, 2020
Merged

helm deployer: Remove duplication #3469

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
25 changes: 8 additions & 17 deletions pkg/skaffold/deploy/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (h *HelmDeployer) Deploy(ctx context.Context, out io.Writer, builds []build
for _, r := range h.Releases {
results, err := h.deployRelease(ctx, out, r, builds)
if err != nil {
releaseName, _ := evaluateReleaseName(r.Name)
releaseName, _ := expandTemplate(r.Name)

event.DeployFailed(err)
return NewDeployErrorResult(errors.Wrapf(err, "deploying %s", releaseName))
Expand Down Expand Up @@ -151,7 +151,7 @@ func (h *HelmDeployer) Dependencies() ([]string, error) {
func (h *HelmDeployer) Cleanup(ctx context.Context, out io.Writer) error {
for _, r := range h.Releases {
if err := h.deleteRelease(ctx, out, r); err != nil {
releaseName, _ := evaluateReleaseName(r.Name)
releaseName, _ := expandTemplate(r.Name)
return errors.Wrapf(err, "deploying %s", releaseName)
}
}
Expand All @@ -177,7 +177,7 @@ func (h *HelmDeployer) helm(ctx context.Context, out io.Writer, useSecrets bool,
}

func (h *HelmDeployer) deployRelease(ctx context.Context, out io.Writer, r latest.HelmRelease, builds []build.Artifact) ([]Artifact, error) {
releaseName, err := evaluateReleaseName(r.Name)
releaseName, err := expandTemplate(r.Name)
if err != nil {
return nil, errors.Wrap(err, "cannot parse the release name template")
}
Expand Down Expand Up @@ -371,14 +371,14 @@ func (h *HelmDeployer) packageChart(ctx context.Context, r latest.HelmRelease) (
tmp := os.TempDir()
packageArgs := []string{"package", r.ChartPath, "--destination", tmp}
if r.Packaged.Version != "" {
v, err := concretize(r.Packaged.Version)
v, err := expandTemplate(r.Packaged.Version)
if err != nil {
return "", errors.Wrap(err, `concretize "packaged.version" template`)
}
packageArgs = append(packageArgs, "--version", v)
}
if r.Packaged.AppVersion != "" {
av, err := concretize(r.Packaged.AppVersion)
av, err := expandTemplate(r.Packaged.AppVersion)
if err != nil {
return "", errors.Wrap(err, `concretize "packaged.appVersion" template`)
}
Expand Down Expand Up @@ -456,7 +456,7 @@ func (h *HelmDeployer) getDeployResults(ctx context.Context, namespace string, r
}

func (h *HelmDeployer) deleteRelease(ctx context.Context, out io.Writer, r latest.HelmRelease) error {
releaseName, err := evaluateReleaseName(r.Name)
releaseName, err := expandTemplate(r.Name)
if err != nil {
return errors.Wrap(err, "cannot parse the release name template")
}
Expand Down Expand Up @@ -501,18 +501,9 @@ func (h *HelmDeployer) Render(context.Context, io.Writer, []build.Artifact, stri
return errors.New("not yet implemented")
}

func evaluateReleaseName(nameTemplate string) (string, error) {
tmpl, err := util.ParseEnvTemplate(nameTemplate)
if err != nil {
return "", errors.Wrap(err, "parsing template")
}

return util.ExecuteEnvTemplate(tmpl, nil)
}

// concretize parses and executes template s with OS environment variables.
// expandTemplate parses and executes template s with OS environment variables.
// If s is not a template but a simple string, returns unchanged s.
func concretize(s string) (string, error) {
func expandTemplate(s string) (string, error) {
tmpl, err := util.ParseEnvTemplate(s)
if err != nil {
return "", errors.Wrap(err, "parsing template")
Expand Down