Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Update k8s and other deps #1555

Merged
merged 2 commits into from
Dec 15, 2020
Merged

Update k8s and other deps #1555

merged 2 commits into from
Dec 15, 2020

Conversation

rmfitzpatrick
Copy link
Contributor

@rmfitzpatrick rmfitzpatrick commented Dec 14, 2020

These changes attempt to add compatibility with shared Splunk OTel Collector dependencies for usage in that library.

  1. Move k8s.io/* libs from 0.17.0 to 0.19.4
  2. Move hashicorp/consul 1.4.0 to hashicorp/consul/api 1.7.0
  3. Move hashicorp/vault from v1.1.1-0.20190321125746-66ef59957aaf to 1.6.0
  4. Adopt signalfx/ingest-protocols v0.0.16

In order to comply with these updates a few signature changes needed to be adopted and some conflicting dependencies required some workarounds:

  1. Per @keitwb's request I'm vendoring in an updated soheilhy/cmux version that adopts go modules to remove a breaking test dependency.
  2. I've added a replace directive to enforce google.golang.org/grpc v1.29.1 since etcd's test dependencies cap at this version before a breaking package removal occurred. When we want to move past this version, upstream or a forked version of etcd will need updates to no longer rely on grpc/naming.

status: Investigating potential CI fallout.
status: I believe I've made all the necessary changes, but will investigate the apparent perf test issues.
-- edit: I missed adding the thirdparty directory to the fakek8s test service so these should be ok.

@rmfitzpatrick rmfitzpatrick added the WIP Work in progress, don't merge as is label Dec 14, 2020
go.mod Outdated Show resolved Hide resolved
@rmfitzpatrick rmfitzpatrick force-pushed the update_k8s branch 4 times, most recently from 5645b46 to 669ad0e Compare December 14, 2020 22:40
@rmfitzpatrick rmfitzpatrick changed the title DNM: update k8s and other deps Update k8s and other deps Dec 14, 2020
@rmfitzpatrick rmfitzpatrick removed the WIP Work in progress, don't merge as is label Dec 14, 2020
Copy link
Contributor

@keitwb keitwb left a comment

Choose a reason for hiding this comment

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

Looks good. go.mod has a conflict now from a PR I just merged but otherwise looks like tests are all good now.

Ryan Fitzpatrick added 2 commits December 15, 2020 14:18
Include vendored soheilhy/cmux that adopts go modules while
breaking out example test module to relax conflicting
google.golang.org/grpc/examples test dep.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants