Refactor KanikoBuild into KanikoArtifact and Cluster#1797
Merged
balopat merged 10 commits intoGoogleContainerTools:masterfrom Mar 15, 2019
Merged
Refactor KanikoBuild into KanikoArtifact and Cluster#1797balopat merged 10 commits intoGoogleContainerTools:masterfrom
balopat merged 10 commits intoGoogleContainerTools:masterfrom
Conversation
added 4 commits
March 13, 2019 11:51
so that other artifacts can use the function.
This commit removes the KanikoBuild type, which is confusing as it reprseents both a builder and an environment. It also assumes that certain elements (buildcontext) apply to all artifacts, when in reality different artifacts should have different buildcontext. KanikoBuild is replaced with a KanikoArtifact type, which can be specified per artifact. I also added a ClusterDetails field to contain info about the cluster itself (namespace, timeouts, secrets etc)
priyawadhwa
requested review from
balopat,
dgageot,
nkubala and
r2d4
as code owners
balopat
reviewed
Mar 15, 2019
pkg/skaffold/build/kaniko/run.go
Outdated
| args = append(args, docker.GetBuildArgs(artifact.DockerArtifact)...) | ||
|
|
||
| // TODO: remove since AdditionalFlags will be deprecated (priyawadhwa@) | ||
| args = append(args, kanikoArtifact.AdditionalFlags...) |
Contributor
There was a problem hiding this comment.
let's put out a deprecation warning here into the log if AdditionalFlags are not empty?
balopat
reviewed
Mar 15, 2019
| if err := withClusterConfig(c, | ||
| setDefaultClusterNamespace, | ||
| setDefaultClusterTimeout, | ||
| setDefaultClusterSecret, |
Contributor
There was a problem hiding this comment.
How about
Suggested change
| setDefaultClusterSecret, | |
| setDefaultClusterPullSecret, |
?
Codecov Report
@@ Coverage Diff @@
## master #1797 +/- ##
=========================================
+ Coverage 45.48% 45.7% +0.21%
=========================================
Files 142 142
Lines 6617 6671 +54
=========================================
+ Hits 3010 3049 +39
- Misses 3306 3316 +10
- Partials 301 306 +5
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #1797 +/- ##
=========================================
+ Coverage 45.48% 45.7% +0.21%
=========================================
Files 142 142
Lines 6617 6671 +54
=========================================
+ Hits 3010 3049 +39
- Misses 3306 3316 +10
- Partials 301 306 +5
Continue to review full report at Codecov.
|
added 2 commits
March 15, 2019 10:51
Contributor
Author
Contributor
|
@priyawadhwa you might want to rebase on top of master instead, you'll get improvements to the integration tests |
Contributor
Author
|
Thanks for the tip @dgageot ! |
balopat
approved these changes
Mar 15, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This PR refactors kaniko, taking the preexisting KanikoBuild type and splitting it up into a per artifact KanikoArtifact and Cluster type.
KanikoArtifactnow contains artifact specified fields (buildcontext, cache, additional flags etc.), whileClusterDetailscontains fields specific to the cluster (namespace, timeout, secrets). This makes more sense to me, since a buildcontext should be different for different artifacts (different bucket to pull from, etc).This PR updates the config to
v1beta8as it represents a breaking change to the skaffold config.I also added an integration test to make sure kaniko can build multiple artifacts.
This refactor will ultimately make it much easier to implement #1549