Skip to content

Remove build dep for helm deploy #2121

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

Merged
merged 4 commits into from
May 20, 2019
Merged

Remove build dep for helm deploy #2121

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
195c87c
Remove build dep for helm deploy
tejal29 May 14, 2019
4104221
fix method sig
tejal29 May 14, 2019
890f7c8
address balopt's review comment
tejal29 May 14, 2019
df8a2a0
address warn to debug
tejal29 May 20, 2019
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
20 changes: 9 additions & 11 deletions pkg/skaffold/deploy/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,7 @@ func (h *HelmDeployer) deployRelease(ctx context.Context, out io.Writer, r lates
color.Red.Fprintf(out, "Helm release %s not installed. Installing...\n", releaseName)
isInstalled = false
}
params, err := h.joinTagsToBuildResult(builds, r.Values)
if err != nil {
return nil, errors.Wrap(err, "matching build results to chart values")
}
params := h.joinTagsToBuildResult(builds, r.Values)

var setOpts []string
for k, v := range params {
Expand Down Expand Up @@ -399,22 +396,23 @@ func (h *HelmDeployer) deleteRelease(ctx context.Context, out io.Writer, r lates
return nil
}

func (h *HelmDeployer) joinTagsToBuildResult(builds []build.Artifact, params map[string]string) (map[string]build.Artifact, error) {
func (h *HelmDeployer) joinTagsToBuildResult(builds []build.Artifact, params map[string]string) map[string]build.Artifact {
imageToBuildResult := map[string]build.Artifact{}
for _, build := range builds {
imageToBuildResult[build.ImageName] = build
for _, b := range builds {
imageToBuildResult[b.ImageName] = b
}

paramToBuildResult := map[string]build.Artifact{}
for param, imageName := range params {
newImageName := util.SubstituteDefaultRepoIntoImage(h.defaultRepo, imageName)
build, ok := imageToBuildResult[newImageName]
b, ok := imageToBuildResult[newImageName]
if !ok {
return nil, fmt.Errorf("no build present for %s", imageName)
logrus.Warnf("no build present for %s. Continuing with %s", imageName, imageName)
b = build.Artifact{ImageName: imageName, Tag: imageName}
}
paramToBuildResult[param] = build
paramToBuildResult[param] = b
}
return paramToBuildResult, nil
return paramToBuildResult
}

func evaluateReleaseName(nameTemplate string) (string, error) {
Expand Down
5 changes: 2 additions & 3 deletions pkg/skaffold/deploy/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
containers:
- name: skaffold-helm
image: gcr.io/nick-cloudbuild/skaffold-helm:f759510436c8fd6f7ffa13dd9e9d85e64bec8d2bfd12c5aa3fb9af1288eccdab
imagePullPolicy:
imagePullPolicy:
command: ["/bin/bash", "-c", "--" ]
args: ["while true; do sleep 30; done;"]
resources:
Expand Down Expand Up @@ -301,11 +301,10 @@ func TestHelmDeploy(t *testing.T) {
builds: testBuilds,
},
{
description: "deploy error unmatched parameter",
description: "deploy should not error for unmatched parameter",
cmd: &MockHelm{t: t},
runContext: makeRunContext(testDeployConfigParameterUnmatched, false),
builds: testBuilds,
shouldErr: true,
},
{
description: "deploy success remote chart with skipBuildDependencies",
Expand Down