Skip to content

Commit aef2627

Browse files
Bump k8s.io/client-go from 0.29.3 to 0.31.0 (#583)
* Bump go deps - Bump github.com/prometheus/common from 0.52.3 to 0.57.0 cf #588 - Bump github.com/prometheus/client_golang from 1.19.0 to 1.20.2 cf #584 - Bump k8s.io/client-go from 0.29.3 to 0.31.0 cf #583 - Bump k8s.io/apimachinery from 0.29.3 to 0.31.0 cf #582 - Bump k8s.io/api from 0.29.3 to 0.30.3 cf #559 * fix prom model breaking change --------- Co-authored-by: Joel Takvorian <[email protected]>
1 parent 48d9fbf commit aef2627

File tree

1,668 files changed

+126189
-54542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,668 files changed

+126189
-54542
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
go: ['1.21','1.22']
13+
go: ['1.22']
1414

1515
steps:
1616
- name: install make

go.mod

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,65 @@
11
module github.com/netobserv/network-observability-console-plugin
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.21.7
5+
toolchain go1.22.4
66

77
require (
88
github.com/gorilla/mux v1.8.1
99
github.com/json-iterator/go v1.1.12
1010
github.com/mitchellh/mapstructure v1.5.0
11-
github.com/prometheus/client_golang v1.19.0
12-
github.com/prometheus/common v0.52.3
11+
github.com/prometheus/client_golang v1.20.2
12+
github.com/prometheus/common v0.57.0
1313
github.com/sirupsen/logrus v1.9.3
1414
github.com/stretchr/testify v1.9.0
1515
gopkg.in/yaml.v3 v3.0.1
16-
k8s.io/api v0.29.3
17-
k8s.io/apimachinery v0.29.3
18-
k8s.io/client-go v0.29.3
16+
k8s.io/api v0.31.0
17+
k8s.io/apimachinery v0.31.0
18+
k8s.io/client-go v0.31.0
1919
)
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26-
github.com/go-logr/logr v1.3.0 // indirect
26+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
27+
github.com/go-logr/logr v1.4.2 // indirect
2728
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2829
github.com/go-openapi/jsonreference v0.20.2 // indirect
29-
github.com/go-openapi/swag v0.22.3 // indirect
30+
github.com/go-openapi/swag v0.22.4 // indirect
3031
github.com/gogo/protobuf v1.3.2 // indirect
3132
github.com/golang/protobuf v1.5.4 // indirect
3233
github.com/google/gnostic-models v0.6.8 // indirect
34+
github.com/google/go-cmp v0.6.0 // indirect
3335
github.com/google/gofuzz v1.2.0 // indirect
34-
github.com/google/uuid v1.3.0 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
3537
github.com/josharian/intern v1.0.0 // indirect
3638
github.com/jpillora/backoff v1.0.0 // indirect
39+
github.com/klauspost/compress v1.17.9 // indirect
3740
github.com/mailru/easyjson v0.7.7 // indirect
3841
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3942
github.com/modern-go/reflect2 v1.0.2 // indirect
4043
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4144
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
42-
github.com/pmezard/go-difflib v1.0.0 // indirect
43-
github.com/prometheus/client_model v0.6.0 // indirect
44-
github.com/prometheus/procfs v0.12.0 // indirect
45-
github.com/rogpeppe/go-internal v1.11.0 // indirect
45+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
46+
github.com/prometheus/client_model v0.6.1 // indirect
47+
github.com/prometheus/procfs v0.15.1 // indirect
4648
github.com/stretchr/objx v0.5.2 // indirect
47-
golang.org/x/net v0.23.0 // indirect
48-
golang.org/x/oauth2 v0.18.0 // indirect
49-
golang.org/x/sys v0.18.0 // indirect
50-
golang.org/x/term v0.18.0 // indirect
51-
golang.org/x/text v0.14.0 // indirect
49+
github.com/x448/float16 v0.8.4 // indirect
50+
golang.org/x/net v0.27.0 // indirect
51+
golang.org/x/oauth2 v0.21.0 // indirect
52+
golang.org/x/sys v0.22.0 // indirect
53+
golang.org/x/term v0.22.0 // indirect
54+
golang.org/x/text v0.16.0 // indirect
5255
golang.org/x/time v0.3.0 // indirect
53-
google.golang.org/appengine v1.6.7 // indirect
54-
google.golang.org/protobuf v1.33.0 // indirect
56+
google.golang.org/protobuf v1.34.2 // indirect
5557
gopkg.in/inf.v0 v0.9.1 // indirect
5658
gopkg.in/yaml.v2 v2.4.0 // indirect
57-
k8s.io/klog/v2 v2.110.1 // indirect
58-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
59-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
59+
k8s.io/klog/v2 v2.130.1 // indirect
60+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
61+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
6062
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6163
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
62-
sigs.k8s.io/yaml v1.3.0 // indirect
64+
sigs.k8s.io/yaml v1.4.0 // indirect
6365
)

go.sum

Lines changed: 66 additions & 60 deletions
Large diffs are not rendered by default.

pkg/prometheus/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func newClient(timeout time.Duration, skipTLS bool, caPath string, forwardUserTo
4343
h := requestHeader.Get(auth.AuthHeader)
4444
if h != "" && strings.HasPrefix(h, "Bearer ") {
4545
token := strings.TrimPrefix(h, "Bearer ")
46-
roundTripper = pconf.NewAuthorizationCredentialsRoundTripper("Bearer", pconf.Secret(token), maybeTLS)
46+
roundTripper = pconf.NewAuthorizationCredentialsRoundTripper("Bearer", pconf.NewInlineSecret(token), maybeTLS)
4747
} else {
4848
log.Debug("Missing Authorization token in user request")
4949
}
@@ -52,7 +52,7 @@ func newClient(timeout time.Duration, skipTLS bool, caPath string, forwardUserTo
5252
if err != nil {
5353
return nil, fmt.Errorf("failed to parse authorization path '%s': %w", tokenPath, err)
5454
}
55-
roundTripper = pconf.NewAuthorizationCredentialsRoundTripper("Bearer", pconf.Secret(string(bytes)), maybeTLS)
55+
roundTripper = pconf.NewAuthorizationCredentialsRoundTripper("Bearer", pconf.NewInlineSecret(string(bytes)), maybeTLS)
5656
} else {
5757
roundTripper = maybeTLS
5858
}

vendor/github.com/cespare/xxhash/v2/README.md

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash.go

Lines changed: 22 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_asm.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_other.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_safe.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)