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.

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

Bump vendored dependencies (part 2) #14606

Merged
merged 7 commits into from
Jan 14, 2021
Merged

Bump vendored dependencies (part 2) #14606

merged 7 commits into from
Jan 14, 2021

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Jan 13, 2021 •
edited

Part 2 of bumping vendored dependencies, following #14572.

Left out the following non-trivial dependencies:

  • google.golang.org/grpc, google.golang.org/protobuf: requires non-trivial API changes
  • go.etcd.io/etcd/clientv3, conflicts with google.golang.org/grpc: 
    go: finding module for package google.golang.org/grpc/naming
github.com/cilium/cilium/pkg/kvstore imports
 go.etcd.io/etcd/clientv3 tested by
 go.etcd.io/etcd/clientv3.test imports
 github.com/coreos/etcd/integration imports
 github.com/coreos/etcd/proxy/grpcproxy imports
 google.golang.org/grpc/naming: module google.golang.org/grpc@latest found (v1.34.1), but does not contain package google.golang.org/grpc/naming```
  • github.com/containernetworking/*: will update in lockstep with

    cilium/contrib/packaging/docker/Dockerfile.runtime

    Lines 53 to 57 in 0a444b7

    curl -sS -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-${ARCH}-v0.8.6.tgz -o cni-plugins-linux-${ARCH}-v0.8.6.tgz && \
    curl -sS -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-${ARCH}-v0.8.6.tgz.sha512 -o cni-plugins-linux-${ARCH}-v0.8.6.tgz.sha512 && \
    sha512sum -c cni-plugins-linux-${ARCH}-v0.8.6.tgz.sha512 && \
    tar -xvf cni-plugins-linux-${ARCH}-v0.8.6.tgz ./loopback && \
    strip -s ./loopback
    , see Bump vendored dependencies (part 2) #14606 (comment)
  • github.com/onsi/ginkgo: leads to CI failures (e.g. https://jenkins.cilium.io/job/Cilium-PR-K8s-1.20-kernel-4.9/402/consoleFull), needs further investigation

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label Jan 13, 2021
@tklauser tklauser requested review from aanm and a team January 13, 2021 16:18
@tklauser tklauser requested a review from a team as a code owner January 13, 2021 16:18
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Jan 13, 2021
@tklauser tklauser force-pushed the pr/tklauser/bump-vendored-deps-part2 branch from f1c81dc to 471ce8f Compare January 13, 2021 16:30
@tklauser
Copy link
Member Author

test-me-please

aanm
aanm requested changes Jan 14, 2021
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

The CI must be failing because of ginkgo dependency update

go.mod Outdated Show resolved Hide resolved
@aanm aanm removed their assignment Jan 14, 2021
@tklauser
vendor: bump github.com/prometheus/client_golang to v1.9.0
3e4051b 
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser force-pushed the pr/tklauser/bump-vendored-deps-part2 branch from 471ce8f to a3e481d Compare January 14, 2021 09:38
@tklauser
Copy link
Member Author

test-me-please

@tklauser
vendor: bump github.com/go-openapi/* to latest version
e9e2c32 
github.com/go-openapi/errors -> v0.19.9
github.com/go-openapi/loads -> v0.20.0
github.com/go-openapi/runtime -> v0.19.24
github.com/go-openapi/spec -> v0.20.0
github.com/go-openapi/strfmt -> v0.19.11
github.com/go-openapi/swag -> v0.19.12
github.com/go-openapi/validate -> v0.20.0

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser
vendor: bump github.com/gogo/protobuf to v1.3.2
26db3c5 
Regenerate the slim k8s api to account for changes in generated code.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser
vendor: bump github.com/google/uuid to v1.1.4
afe232e 
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser
vendor: bump github.com/sirupsen/logrus to v1.7.0
59f357e 
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser
vendor: bump google.golang.org/genproto to v0.0.0-20210111234610-22ae…
83be8b0 
…2b108f89

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser
vendor: bump github.com/Azure/* to latest version
89bba0f 
github.com/Azure/azure-sdk-for-go -> v50.0.0+incompatible
github.com/Azure/go-autorest/autorest -> v0.11.16
github.com/Azure/go-autorest/autorest/adal -> v0.9.10
github.com/Azure/go-autorest/autorest/azure/auth -> v0.5.5

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser force-pushed the pr/tklauser/bump-vendored-deps-part2 branch from a3e481d to 89bba0f Compare January 14, 2021 09:46
@tklauser
Copy link
Member Author

tklauser commented Jan 14, 2021 •
edited

test-me-please

(forgot to run go mod tidy after dropping containernetworking and ginkgo bump commits)

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 14, 2021
@gandro gandro merged commit d3cbec1 into master Jan 14, 2021
@gandro gandro deleted the pr/tklauser/bump-vendored-deps-part2 branch January 14, 2021 12:22
@tklauser tklauser mentioned this pull request Jan 14, 2021
Merged
tklauser added a commit that referenced this pull request Jan 14, 2021
@tklauser
vendor: bump github.com/containernetworking/* to latest version
47cb15f 
This will also bump ginkgo and gomega to a newer version, not the latest
though. The latest version currently breaks our CI (see #14606), but
this intermediate version doesn't seem to, so it's fine to bump it to
that for now.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
gandro pushed a commit that referenced this pull request Jan 18, 2021
@tklauser @gandro
vendor: bump github.com/containernetworking/* to latest version
c20e67a 
This will also bump ginkgo and gomega to a newer version, not the latest
though. The latest version currently breaks our CI (see #14606), but
this intermediate version doesn't seem to, so it's fine to bump it to
that for now.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser mentioned this pull request Feb 1, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@errordeveloper errordeveloper errordeveloper approved these changes

@aanm aanm aanm approved these changes

Assignees
No one assigned
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.10.0
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tklauser @errordeveloper @aanm @gandro