Allow configuring jib plugin type
#2964
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
briandealwis
requested review from
balopat,
chanseokoh,
dgageot,
loosebazooka,
nkubala,
priyawadhwa,
TadCordle and
tejal29
as code owners
chanseokoh
reviewed
Oct 1, 2019
Codecov Report
|
balopat
reviewed
Oct 10, 2019
| @@ -778,6 +778,8 @@ type JibArtifact struct { | |||
| // For example: `["--no-build-cache"]`. | |||
| Flags []string `yaml:"args,omitempty"` | |||
|
|
|||
| // Type the Jib builder type (internal: see jib.PluginType) | |||
| Type int `yaml:"-"` | |||
There was a problem hiding this comment.
This should be fine as it actually helps making the upgrade process to not break when the detection mechanism doesn't work. It is a conservative change. I will use admin rights to merge this PR.
balopat
added
the
docs-modifications
|
Please visit http://35.236.103.231:1313 to view changes to the docs. |
container-tools-bot
removed
the
docs-modifications
chanseokoh
approved these changes
Oct 16, 2019
|
Sorry @balopat, this totally slipped through the cracks. |
balopat
reviewed
Oct 18, 2019
pkg/skaffold/schema/latest/config.go
Outdated
| @@ -778,6 +778,8 @@ type JibArtifact struct { | |||
| // For example: `["--no-build-cache"]`. | |||
| Flags []string `yaml:"args,omitempty"` | |||
|
|
|||
| // Type the Jib builder type (internal: see jib.PluginType) | |||
| Type int `yaml:"-"` | |||
| // Type the Jib builder type; normally determined automatically. Valid types are: | |||
There was a problem hiding this comment.
Suggested change
| // Type the Jib builder type; normally determined automatically. Valid types are: | |
| // Type the Jib builder type; if not set then it is detected automatically. Valid types are: |
|
I need to update this in light of #3041 |
|
I hacked up the schema generator to emit JSON schema |
|
This is awesome, thanks for putting the enum together as well! |
balopat
approved these changes
Nov 6, 2019
|
Merged with admin privileges for the historical version change as it actually helps with upgrades. |
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 #2963.
Note that this is a somewhat unorthodox change as it exposes an internal and previously ignored field from the
v1beta14'sjibconfig.Description
In #2808 we unified the
jibMavenandjibGradleconfiguration blocks into a singlejibblock. The Skaffold-Jib builder looks for certain files to determine the Jib plugin type (Maven or Gradle). We've had a report where Skaffold-Jib was unable to guess the Jib plugin type. This PR adds the ability to explicitly configure thejibblock to specify the plugin type.The unified
JibArtifactalready has aTypefield which allows explicitly specifying the builder type. This field is internal and not marshalled. The intent was to expose this field to encode a Go enum (with correspondingMarshalYAML()andUnmarshalYAML()) but I punted at the time as it required teaching the schema generator to output JSON schemaenum. But I realized that thepkg/skaffold/schema/validationapproach was easier, but it requires changing the type ofType.User facing changes
This PR changes the type of
JibArtifact'sTypefield and exposes it. As a result:v1beta14andv1beta15'sjibnow have optionaltypefieldsskaffold fixonv1beta13jibMavenandjibGradleconfigurations will now have atypefieldReviewer Notes
Release Notes
jibartifacts can explicitly specify the plugin type asmavenorgradle