New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into jib_skaffold feature branch. #1117

Merged

balopat merged 63 commits into GoogleContainerTools:jib_skaffold from loosebazooka:jib_skaffold

Oct 8, 2018

Member

loosebazooka commented Oct 8, 2018

Another merge for some reason. I must have done something really weird the first time.

dgageot and others added 30 commits

October 3, 2018 10:15


          Print test logs and pass a context

bf4bc7d

Also fix a few comments

Signed-off-by: David Gageot <david@gageot.net>


          skaffold dev now detects new test cases

f2465c5

Fix #1079

Signed-off-by: David Gageot <david@gageot.net>


          Implement a manual trigger for watch mode

62b5ff6

Signed-off-by: David Gageot <david@gageot.net>


          Merge pull request #1080 from dgageot/improve-tests

101f534

Couple of improvements to the test phase


          Merge pull request #1085 from dgageot/manual-watch-node

8f96420

Implement a manual trigger for watch mode


          Fix missing parenthesis

778d5da

Signed-off-by: David Gageot <david@gageot.net>


          Skaffold init asks user to write skaffold.yaml

37b2255

Fix #1090

Signed-off-by: David Gageot <david@gageot.net>


          Merge pull request #1089 from dgageot/fix-parenthesis

b0a57aa

Fix missing parenthesis


          Merge pull request #1091 from dgageot/ask-init

3e2d5c1

Skaffold init asks user to write skaffold.yaml


          Merge error?

acdebaf

Signed-off-by: David Gageot <david@gageot.net>


          Add --label flag to specify custom labels for deployments

b862d80

This should work for skaffold run, dev, and deploy. This is one of the
features requested for integrating skaffold with IntelliJ.

e.g. skaffold run --label firstlabel=one --label secondlabel=two


          Merge pull request #1098 from priyawadhwa/label

de0cd3d

Add --label flag to specify custom labels for deployments


          Merge pull request #1095 from dgageot/merge-error

616f9f7

removes unnecessary StructureTestFiles field


          [examples] add webserver file sync example

1d2281a


          [kubernetes] add kubectl syncer

350f0b0


          [runner] add sync step to skaffold dev

9a1d4d0


          [examples] add readme to webserver example

64af3ab


          [linter] fixes

884e6b3


          review feedback

16415be


          [vendor] add x/sync/errgroup

98b2219


          [linter] add boilerplate to sync_test.go

f0ed4cd


          File changes should be relative to artifact context

c511693


          rename webserver example to hot reload

88f3d02


          [sync] move to sync package, move logic to watch main loop

6edae2e


          [examples] add flask hot-reload example

81bd94c


          add boilerplate

f7b8a44


          linter fixes

799d630


          rebase on v1alpha4

d565e05


          fix windows test

931b5d8


          [parse] remove loud debug statements

35ef51c

These run every second, so its difficult to read other debug statements

dgageot and others added 24 commits

October 5, 2018 10:12


          Auto-detect GCP project/bucket

18f4a64

Signed-off-by: David Gageot <david@gageot.net>


          Override Kaniko image

db35ea5

Signed-off-by: David Gageot <david@gageot.net>


          Upgrade to the Kaniko 0.4.0

Signed-off-by: David Gageot <david@gageot.net>


          Simplify code that sets default config

b0df629

Signed-off-by: David Gageot <david@gageot.net>


          Fix errors

b0091ea

Signed-off-by: David Gageot <david@gageot.net>


          Not needed

faecc29


          Add a comment

fea9ad1

Signed-off-by: David Gageot <david@gageot.net>


          Simplify code

7f42c63

Signed-off-by: David Gageot <david@gageot.net>


          Improve logs

d860c54

Signed-off-by: David Gageot <david@gageot.net>


          Pass context

97b0ea1

Signed-off-by: David Gageot <david@gageot.net>


          Add an error if not all the files were synced

34ddc96

Signed-off-by: David Gageot <david@gageot.net>


          Pods are not labeled by Skaffold

We can’t use skaffold labels to narrow down the
list of pods.

Signed-off-by: David Gageot <david@gageot.net>


          Make the code go-routine safe

Signed-off-by: David Gageot <david@gageot.net>


          Remove duplication

c53bb86


          Deal with files synced to multiple pods.

3e8f198

Sync files in a sequential manner, it makes
the code simpler and anyway, the typical use case
will be to sync one file with one pod.

Signed-off-by: David Gageot <david@gageot.net>


          Merge pull request #1101 from dgageot/kaniko-improvements

d5853d4

Kaniko improvements


          Rename SkaffoldConfig to SkaffoldPipeline

2e3df18


          add back kind

016e475


          nits

07bca7d


          Merge pull request #1087 from nkubala/pipeline

ee4f75b

Rename SkaffoldConfig to SkaffoldPipeline


          Merge pull request #1102 from dgageot/improve-sync

227ed25

Improve sync


          Update labels when deploying to namespace other than default

f25a922

Fixes #1112

Signed-off-by: David Gageot <david@gageot.net>


          Merge pull request #1115 from dgageot/fix-1112

ac64849

Update labels when deploying to namespace other than default


          Merge branch 'master' into jib_skaffold

1b64f93

googlebot commented Oct 8, 2018

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

codecov-io commented Oct 8, 2018

Codecov Report

Merging #1117 into jib_skaffold will not change coverage.
The diff coverage is n/a.

@@              Coverage Diff              @@
##           jib_skaffold    #1117   +/-   ##
=============================================
  Coverage         43.84%   43.84%           
=============================================
  Files                81       81           
  Lines              3526     3526           
=============================================
  Hits               1546     1546           
  Misses             1838     1838           
  Partials            142      142

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 efbcbc0...1b64f93. Read the comment docs.

Member Author

loosebazooka commented Oct 8, 2018

@balopat I guess I can't add reviewers to this.

Contributor

balopat commented Oct 8, 2018

alright, let's try!

balopat merged commit c55909b into GoogleContainerTools:jib_skaffold

loosebazooka deleted the jib_skaffold branch

October 9, 2018 14:16

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet