Include runtime dependencies for taggers in gcr.io/k8s-skaffold/skaffold#1987
Merged
balopat merged 5 commits intoGoogleContainerTools:masterfrom Apr 23, 2019
Merged
Conversation
corneliusweig
requested review from
balopat,
dgageot,
nkubala,
priyawadhwa and
r2d4
as code owners
corneliusweig
changed the title
gcr.io/k8s-skaffold/skaffoldgcr.io/k8s-skaffold/skaffold
corneliusweig
changed the title
gcr.io/k8s-skaffold/skaffoldgcr.io/k8s-skaffold/skaffold
Codecov Report
@@ Coverage Diff @@
## master #1987 +/- ##
==========================================
+ Coverage 55.48% 55.49% +0.01%
==========================================
Files 173 173
Lines 7510 7512 +2
==========================================
+ Hits 4167 4169 +2
Misses 2952 2952
Partials 391 391
Continue to review full report at Codecov.
|
Contributor
|
can you please rebase this to master? the kokoro failure is fixed now there. Thank you! |
balopat
reviewed
Apr 20, 2019
deploy/skaffold/Dockerfile
Outdated
| FROM gcr.io/gcp-runtimes/ubuntu_16_0_4 as runtime_deps | ||
|
|
||
| # needed for dateTime tagger | ||
| COPY --from=golang:1.11 /usr/local/go/lib/time/zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip |
Contributor
There was a problem hiding this comment.
hmmm...this smells a little bit for me...and not just me: golang/go#21881 (comment) - maybe we should try 4d63.com/tz ?
Contributor
Author
There was a problem hiding this comment.
Yes, absolutely! With 4d63.com/tz the dateTime tagger will also work on windows :)
Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
For the git tagger test, set up a dummy repo inside the testdata folder. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
corneliusweig
force-pushed
the
skaffold-image
branch
from
57ebf07 to
14ee49f
Compare
This ensures that te dateTime tagger works on windows when go is not installed. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Contributor
Author
|
@balopat PTAL. The first three commits were rebased as requested, the last one is new and adds |
priyawadhwa
added
kokoro:run
Contributor
|
@corneliusweig kokoro tests are failing: |
Git commits need a configured author. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
dgageot
approved these changes
Apr 23, 2019
Contributor
Author
|
...that was hard to find 😓 |
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
7 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.
Also extend integration tests to assert on the expected image tags.
In addition, remove
helm-${HELM_VERSION}-linux-amd64.tar.gzfrom the skaffold image.Fixes #1979