Git tagger variants (Tags, CommitSha, AbbrevCommitSha) by corneliusweig · Pull Request #1902 · GoogleContainerTools/skaffold

corneliusweig · 2019-04-01T23:08:36Z

Synopsis

Currently, the git tagger always uses git tags or abbreviated git hashes to generate image tags. Issue #407 suggests, to extends the git tagger with a few variants:

Tags (default): use git tags or fall back to abbreviated commit hash
CommitSha: use the full git commit sha
AbbrevCommitSha: use the abbreviated git commit sha

Config change

To switch between the different variants of the git tagger, the GitTagger config was changed to

tagPolicy:
  #  before
  # gitCommit: {}

  # new
  gitCommit:
   # variant is an enum with valid values (case-insensitive)
   # - Tags
   # - CommitSha
   # - AbbrevCommitSha
    variant: Tags # default

See #407

corneliusweig · 2019-04-02T11:38:54Z

Well, OSX seems to have serious trouble to determine the git path for the TreeSha variant. I'm going to remove TreeSha and AbbrevTreeSha for now and create a separate PR for those, because I have no way to debug this.

codecov-io · 2019-04-02T11:53:45Z

Codecov Report

Merging #1902 into master will increase coverage by 3.33%.
The diff coverage is 84.61%.

@@            Coverage Diff             @@
##           master    #1902      +/-   ##
==========================================
+ Coverage   52.59%   55.92%   +3.33%     
==========================================
  Files         182      173       -9     
  Lines        7893     7565     -328     
==========================================
+ Hits         4151     4231      +80     
+ Misses       3352     2940     -412     
- Partials      390      394       +4

Impacted Files	Coverage Δ
pkg/skaffold/schema/latest/config.go	`100% <ø> (ø)`	⬆️
pkg/skaffold/schema/v1beta8/upgrade.go	`66.66% <ø> (ø)`	⬆️
pkg/skaffold/runner/runner.go	`66.87% <100%> (+4.93%)`	⬆️
pkg/skaffold/build/tag/git_commit.go	`80% <84%> (+3.8%)`	⬆️
pkg/skaffold/build/local/docker.go	`56.81% <0%> (-43.19%)`	⬇️
pkg/skaffold/jib/jib.go	`76.34% <0%> (-7.53%)`	⬇️
pkg/skaffold/util/util.go	`64.92% <0%> (-3.05%)`	⬇️
pkg/skaffold/jib/jib_gradle.go	`100% <0%> (ø)`	⬆️
pkg/skaffold/jib/jib_maven.go	`100% <0%> (ø)`	⬆️
pkg/skaffold/schema/v1beta7/config.go	`100% <0%> (ø)`	⬆️
... and 47 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc22668...63d0f58. Read the comment docs.

- Tags (default): use git tags or fall back to abbreviated commit hash - CommitSha: use the full git commit sha - AbbrevCommitSha: use the abbreviated git commit sha Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

Variant is an enum that selects which git tagger variant to use. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

corneliusweig · 2019-04-17T19:30:30Z

pkg/skaffold/schema/latest/config.go

 // GitTagger *beta* tags images with the git tag or commit of the artifact's workspace.
-type GitTagger struct{}
+type GitTagger struct {
+	// Variant determines the behavior of the git tagger. Valid variants are


Will this doc string list render well in the consumers of this doc?

it's not the best, maybe we could remove the dashes?
multiline comments get merged into a single line - you can always check with make preview-docs!
https://github.com/GoogleContainerTools/skaffold/pull/1902/files#diff-4db1e0a21e170b019f0d05230514a5ccR808
http://35.236.122.247:1313/docs/references/yaml/

you can always check with make preview-docs!

So true...
I agree, the dashes really don't help. But I just realized that I can wrap the enum values with backticks, which should help.

container-tools-bot · 2019-04-17T21:53:55Z

Please visit http://35.236.122.247:1313 to view changes to the docs.

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

nkubala

two small nits, but otherwise LGTM

pkg/skaffold/build/tag/git_commit.go

pkg/skaffold/schema/v1beta7/upgrade.go

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

nkubala · 2019-04-25T21:24:12Z

pkg/skaffold/schema/v1beta7/upgrade.go

 // Upgrade upgrades a configuration to the next version.
 // Config changes from v1beta7 to v1beta8
 // 1. Additions:
-// kaniko/resource requirements


should this be removed?

Of course not, so lazy of me 🤦‍♂️

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

container-tools-bot · 2019-04-25T22:16:19Z

Please visit http://35.236.71.41:1313 to view changes to the docs.

balopat

LGTM, thank you!

corneliusweig requested review from balopat, dgageot, nkubala, priyawadhwa and r2d4 as code owners April 1, 2019 23:08

googlebot added the cla: yes label Apr 1, 2019

corneliusweig force-pushed the git-tagger-improvements branch from 11309cc to fcc5cec Compare April 1, 2019 23:08

tejal29 added the kokoro:run runs the kokoro jobs on a PR label Apr 1, 2019

kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Apr 1, 2019

corneliusweig force-pushed the git-tagger-improvements branch from d599e4c to 6213829 Compare April 2, 2019 10:07

corneliusweig force-pushed the git-tagger-improvements branch from 6213829 to ffaefc8 Compare April 2, 2019 11:39

corneliusweig changed the title ~~Git tagger variants (Tags, CommitSha, AbbrevCommitSha, TreeSha, AbbrevTreeSha)~~ Git tagger variants (Tags, CommitSha, AbbrevCommitSha) Apr 2, 2019

corneliusweig mentioned this pull request Apr 2, 2019

Additional git tagger variants (TreeSha, AbbrevTreeSha) #1905

Merged

corneliusweig force-pushed the git-tagger-improvements branch 3 times, most recently from 63aa411 to 4262cd2 Compare April 5, 2019 13:19

corneliusweig force-pushed the git-tagger-improvements branch from 4262cd2 to 8f1a18b Compare April 16, 2019 10:32

corneliusweig force-pushed the git-tagger-improvements branch from 8f1a18b to 52ec837 Compare April 16, 2019 20:01

Add new config option gitTagger/variant

c6752d4

Variant is an enum that selects which git tagger variant to use. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

corneliusweig force-pushed the git-tagger-improvements branch from 52ec837 to c6752d4 Compare April 16, 2019 20:10

corneliusweig commented Apr 17, 2019

View reviewed changes

balopat added the kokoro:run runs the kokoro jobs on a PR label Apr 17, 2019

kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Apr 17, 2019

balopat added the docs-modifications runs the docs preview service on the given PR label Apr 17, 2019

container-tools-bot removed the docs-modifications runs the docs preview service on the given PR label Apr 17, 2019

Improve markup for the documentation

b71e38b

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

nkubala reviewed Apr 25, 2019

View reviewed changes

pkg/skaffold/build/tag/git_commit.go Outdated Show resolved Hide resolved

pkg/skaffold/build/tag/git_commit.go Outdated Show resolved Hide resolved

nkubala reviewed Apr 25, 2019

View reviewed changes

pkg/skaffold/schema/v1beta7/upgrade.go Outdated Show resolved Hide resolved

Improve error messages for invalid tagger variants

0653185

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

corneliusweig requested a review from tejal29 as a code owner April 25, 2019 19:05

Move addition to v1beta8

8b86017

nkubala reviewed Apr 25, 2019

View reviewed changes

Add back erroneously removed commend

63d0f58

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

balopat added the kokoro:run runs the kokoro jobs on a PR label Apr 25, 2019

kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Apr 25, 2019

balopat added the docs-modifications runs the docs preview service on the given PR label Apr 25, 2019

container-tools-bot removed the docs-modifications runs the docs preview service on the given PR label Apr 25, 2019

balopat approved these changes Apr 25, 2019

View reviewed changes

balopat merged commit 9c47a08 into GoogleContainerTools:master Apr 25, 2019

corneliusweig deleted the git-tagger-improvements branch April 25, 2019 22:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Git tagger variants (Tags, CommitSha, AbbrevCommitSha)#1902

Git tagger variants (Tags, CommitSha, AbbrevCommitSha)#1902
balopat merged 6 commits intoGoogleContainerTools:masterfrom
corneliusweig:git-tagger-improvements

corneliusweig commented Apr 1, 2019 •

edited

Loading

Uh oh!

corneliusweig commented Apr 2, 2019

Uh oh!

codecov-io commented Apr 2, 2019 •

edited

Loading

Uh oh!

corneliusweig Apr 17, 2019 •

edited

Loading

Uh oh!

balopat Apr 17, 2019

Uh oh!

corneliusweig Apr 17, 2019

Uh oh!

container-tools-bot commented Apr 17, 2019

Uh oh!

nkubala left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nkubala Apr 25, 2019

Uh oh!

corneliusweig Apr 25, 2019

Uh oh!

container-tools-bot commented Apr 25, 2019

Uh oh!

balopat left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

corneliusweig commented Apr 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Synopsis

Config change

Uh oh!

corneliusweig commented Apr 2, 2019

Uh oh!

codecov-io commented Apr 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

corneliusweig Apr 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

balopat Apr 17, 2019

Choose a reason for hiding this comment

Uh oh!

corneliusweig Apr 17, 2019

Choose a reason for hiding this comment

Uh oh!

container-tools-bot commented Apr 17, 2019

Uh oh!

nkubala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nkubala Apr 25, 2019

Choose a reason for hiding this comment

Uh oh!

corneliusweig Apr 25, 2019

Choose a reason for hiding this comment

Uh oh!

container-tools-bot commented Apr 25, 2019

Uh oh!

balopat left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

corneliusweig commented Apr 1, 2019 •

edited

Loading

codecov-io commented Apr 2, 2019 •

edited

Loading

corneliusweig Apr 17, 2019 •

edited

Loading