Skip to content
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.

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

Include a commit with K8s 1.20 libs #1027

Merged
merged 3 commits into from
Jun 1, 2021
Merged

Conversation

dprotaso
Copy link
Contributor

@dprotaso dprotaso commented May 31, 2021

I'm trying to bump Knative's K8s dependency to 1.20 - but this repo skipped 1.20 to 1.21.

I'm hoping this PR is a noop for most - but gives me the ability to target a specific commit that uses K8s 1.20.x deps.

Thus I'm expecting the commit history to not be squashed

@dprotaso
Copy link
Contributor Author

dprotaso commented Jun 1, 2021

Is this a flakey test?

--- FAIL: TestMultiWrite_Progress (4.87s)
progress_test.go:227: saw progress revert: was high of 6726222, saw 6660686

@imjasonh
Copy link
Collaborator

imjasonh commented Jun 1, 2021

Is this a flakey test?

Yep 😢

This change sgtm

@@ -3,15 +3,27 @@ module github.com/google/go-containerregistry/pkg/authn/k8schain
go 1.14

require (
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah let me re-run the commands

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not obvious to me why the go tool chain made it show up as //indirect here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go mod tidy FTW

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fsnotify remained - I deleted all //indirect dependencies and ran go mod tidy again

@codecov-commenter
Copy link

codecov-commenter commented Jun 1, 2021

Codecov Report

Merging #1027 (2a95682) into main (0233fcd) will not change coverage.
The diff coverage is n/a.

❗ Current head 2a95682 differs from pull request most recent head 27f0910. Consider uploading reports for the commit 27f0910 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1027   +/-   ##
=======================================
  Coverage   75.03%   75.03%           
=======================================
  Files         107      107           
  Lines        5072     5072           
=======================================
  Hits         3806     3806           
  Misses        720      720           
  Partials      546      546           

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 0233fcd...27f0910. Read the comment docs.

@dprotaso
Copy link
Contributor Author

dprotaso commented Jun 1, 2021

/hold one sec

@dprotaso dprotaso force-pushed the k8schain-k8s branch 2 times, most recently from 27f0910 to a1dcf6e Compare June 1, 2021 18:16
@jonjohnsonjr jonjohnsonjr merged commit 0ffa4a5 into google:main Jun 1, 2021
@dprotaso dprotaso deleted the k8schain-k8s branch June 1, 2021 19:41
@dprotaso
Copy link
Contributor Author

dprotaso commented Jun 10, 2021

hmm.. did you squash the commits?

@jonjohnsonjr
Copy link
Collaborator

See green button. Push green button. 🐒

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants