Skip to content

Commit

Permalink
[chore] Upgrade k8s.io/client-go to v0.28.1 (open-telemetry#26243)
Browse files Browse the repository at this point in the history
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
There was a breaking change in this upgrade that needed to be handled
manually. The fix is to replace usages of ConfigMapsLeasesResourceLock
with LeasesResourceLock.

To do the deps updates I did the following:
``` 
cd internal/aws/k8s/
go get -u k8s.io/[email protected]
cd ../../kubelet/
go get -u k8s.io/[email protected]
```
These directories correspond to the two PRs that were closed because of
the original issue.
Original PRs: open-telemetry#26010, and open-telemetry#26156.

This doesn't update all packages to use v0.28.1, so let me know if I
should update to include all others as well.

**Link to tracking Issue:** <Issue number if applicable>
Fixes open-telemetry#26024

**Testing:** <Describe what testing was performed and which tests were
added.>
Build completes successfully now

**Documentation:** <Describe the documentation added.>
  • Loading branch information
crobert-1 committed Aug 28, 2023
1 parent 49e5497 commit 110cd54
Show file tree
Hide file tree
Showing 15 changed files with 200 additions and 280 deletions.
14 changes: 7 additions & 7 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cadvisor v0.47.3 // indirect
github.com/google/flatbuffers v23.1.21+incompatible // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -684,14 +684,14 @@ require (
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
k8s.io/api v0.27.4 // indirect
k8s.io/apimachinery v0.27.4 // indirect
k8s.io/client-go v0.27.4 // indirect
k8s.io/api v0.28.1 // indirect
k8s.io/apimachinery v0.28.1 // indirect
k8s.io/client-go v0.28.1 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kubelet v0.27.4 // indirect
k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/controller-runtime v0.15.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
31 changes: 15 additions & 16 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cadvisor v0.47.3 // indirect
github.com/google/flatbuffers v23.1.21+incompatible // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -694,14 +694,14 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
k8s.io/api v0.27.4 // indirect
k8s.io/apimachinery v0.27.4 // indirect
k8s.io/client-go v0.27.4 // indirect
k8s.io/api v0.28.1 // indirect
k8s.io/apimachinery v0.28.1 // indirect
k8s.io/client-go v0.28.1 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/kubelet v0.27.4 // indirect
k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/controller-runtime v0.15.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
Loading

0 comments on commit 110cd54

Please sign in to comment.