Fix redundant Jib image flags generated by init #3191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TadCordle
requested review from
balopat,
briandealwis,
chanseokoh,
dgageot,
loosebazooka,
nkubala and
tejal29
as code owners
chanseokoh
reviewed
Nov 6, 2019
pkg/skaffold/jib/jib_init_test.go
Outdated
| }, | ||
| ImageName: "different-image", | ||
| Workspace: filepath.Join("path", "to"), | ||
| ArtifactType: latest.ArtifactType{JibArtifact: &latest.JibArtifact{Type: string(JibGradle)}}, |
There was a problem hiding this comment.
About #3190 (comment), is it easy to get rid of type: gradle or it is safe to put them?
There was a problem hiding this comment.
@briandealwis would know better than I. But I can try some stuff.
There was a problem hiding this comment.
It should be safe to remove.
dgageot
approved these changes
Nov 6, 2019
Codecov Report
|
briandealwis
reviewed
Nov 6, 2019
| a.ArtifactType = latest.ArtifactType{JibArtifact: jibMaven} | ||
| } else if j.BuilderName == PluginName(JibGradle) { | ||
| jibGradle := &latest.JibArtifact{Type: string(JibGradle)} | ||
| if j.Project != "" { | ||
| jibGradle.Project = j.Project | ||
| } | ||
| jibGradle.Flags = []string{"-Dimage=" + manifestImage} |
There was a problem hiding this comment.
This should have been --image too, I think?
There was a problem hiding this comment.
-Dimage= will work as well, and I know --image doesn't work when put before, say, jibDockerBuild, so I prefer it to --image. It's safer.
chanseokoh
approved these changes
Nov 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3190.
Description
Since the correct
-Dimageflag is automatically generated during Jib builds, it's unnecessary (or even error prone) to generate the flags duringskaffold init.Release Notes
Fix unnecessary Jib image flags generated during
skaffold init.