Skip to content

Commit 5df3945

Browse files
[Backport release/2.10.x] Bump kubernetes telemetry to 0.1.0 (#4291)
* chore: bump kubernetes-telemetry to v0.1.0 * chore: fix tests --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 3109827 commit 5df3945

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ go 1.20
66
exclude (
77
sigs.k8s.io/gateway-api v0.6.2
88
sigs.k8s.io/gateway-api v0.7.0
9+
sigs.k8s.io/gateway-api v0.7.1
910
)
1011

1112
require (
@@ -21,7 +22,7 @@ require (
2122
github.com/jpillora/backoff v1.0.0
2223
github.com/kong/deck v1.21.0
2324
github.com/kong/go-kong v0.42.0
24-
github.com/kong/kubernetes-telemetry v0.0.5
25+
github.com/kong/kubernetes-telemetry v0.1.0
2526
github.com/kong/kubernetes-testing-framework v0.31.0
2627
github.com/lithammer/dedent v1.1.0
2728
github.com/miekg/dns v1.1.54
@@ -33,15 +34,15 @@ require (
3334
github.com/samber/lo v1.38.1
3435
github.com/samber/mo v1.8.0
3536
github.com/sethvargo/go-password v0.2.0
36-
github.com/sirupsen/logrus v1.9.2
37+
github.com/sirupsen/logrus v1.9.3
3738
github.com/spf13/cobra v1.7.0
3839
github.com/spf13/pflag v1.0.5
3940
github.com/stretchr/testify v1.8.4
4041
google.golang.org/api v0.125.0
41-
k8s.io/api v0.27.2
42+
k8s.io/api v0.27.3
4243
k8s.io/apiextensions-apiserver v0.27.2
43-
k8s.io/apimachinery v0.27.2
44-
k8s.io/client-go v0.27.2
44+
k8s.io/apimachinery v0.27.3
45+
k8s.io/client-go v0.27.3
4546
k8s.io/component-base v0.27.2
4647
knative.dev/networking v0.0.0-20230504184058-77975a12b2ee
4748
knative.dev/pkg v0.0.0-20230502134655-db8a35330281
@@ -60,7 +61,7 @@ require (
6061
github.com/gammazero/workerpool v1.1.3 // indirect
6162
github.com/google/go-containerregistry v0.13.0 // indirect
6263
github.com/google/s2a-go v0.1.4 // indirect
63-
github.com/puzpuzpuz/xsync/v2 v2.4.0 // indirect
64+
github.com/puzpuzpuz/xsync/v2 v2.4.1 // indirect
6465
github.com/shoenig/go-m1cpu v0.1.6 // indirect
6566
go.uber.org/atomic v1.10.0 // indirect
6667
go.uber.org/zap v1.24.0 // indirect

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ github.com/kong/deck v1.21.0 h1:L/vs4WvA5n5d3nqMiBxgxzb0xxqaCD8G2uCzzO+VwxI=
249249
github.com/kong/deck v1.21.0/go.mod h1:4ifsbs8AcrvTSdQG4snxaaKiSGEv6l4eyeHOMoOlv+Y=
250250
github.com/kong/go-kong v0.42.0 h1:N0Rth32eGq6S5x33Txu+Gv9ZJ3gG5noffDjqezwutfA=
251251
github.com/kong/go-kong v0.42.0/go.mod h1:YUq7A3gcwk+9Z1ajwzVY2HnSyL/IKq/TJHsJDqT8hJM=
252-
github.com/kong/kubernetes-telemetry v0.0.5 h1:FCJx1ShFXbqNb2K6N9FE3MZKwCkp8CEVAJuej5+1S9U=
253-
github.com/kong/kubernetes-telemetry v0.0.5/go.mod h1:FrAXjZHEPSAEL4aUXnNOpPoRiA68VJvwgN8dfG/qF60=
252+
github.com/kong/kubernetes-telemetry v0.1.0 h1:dyDhB2SUvxVaDAxaZtLWL7JGAbkgwlCUM1P8gR/rCl0=
253+
github.com/kong/kubernetes-telemetry v0.1.0/go.mod h1:YYG7TkKnWlHov0+pSgK0XFsg85q0EzsYWXBl6Kehnjo=
254254
github.com/kong/kubernetes-testing-framework v0.31.0 h1:3MTlUeiD/jV3ArdZWfRLidi7kchg19HI222dXQHwasw=
255255
github.com/kong/kubernetes-testing-framework v0.31.0/go.mod h1:RKFMHJCDByNnHiw+hRLwR26eIZRgd5ImhwYjwK+yUQg=
256256
github.com/kong/semver/v4 v4.0.1 h1:DIcNR8W3gfx0KabFBADPalxxsp+q/5COwIFkkhrFQ2Y=
@@ -343,8 +343,8 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO
343343
github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
344344
github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
345345
github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8=
346-
github.com/puzpuzpuz/xsync/v2 v2.4.0 h1:5sXAMHrtx1bg9nbRZTOn8T4MkWe5V+o8yKRH02Eznag=
347-
github.com/puzpuzpuz/xsync/v2 v2.4.0/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU=
346+
github.com/puzpuzpuz/xsync/v2 v2.4.1 h1:aGdE1C/HaR/QC6YAFdtZXi60Df8/qBIrs8PKrzkItcM=
347+
github.com/puzpuzpuz/xsync/v2 v2.4.1/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU=
348348
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
349349
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
350350
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -365,8 +365,8 @@ github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnj
365365
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
366366
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
367367
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
368-
github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
369-
github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
368+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
369+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
370370
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
371371
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
372372
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -621,16 +621,16 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
621621
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
622622
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
623623
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
624-
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
625-
k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
624+
k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y=
625+
k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg=
626626
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
627627
k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
628-
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
629-
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
628+
k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
629+
k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
630630
k8s.io/cli-runtime v0.27.2 h1:9HI8gfReNujKXt16tGOAnb8b4NZ5E+e0mQQHKhFGwYw=
631631
k8s.io/cli-runtime v0.27.2/go.mod h1:9UecpyPDTkhiYY4d9htzRqN+rKomJgyb4wi0OfrmCjw=
632-
k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
633-
k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
632+
k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8=
633+
k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48=
634634
k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
635635
k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
636636
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=

internal/manager/telemetry/telemetry_test.go renamed to test/envtest/telemetry_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
//go:build envtest
2-
// +build envtest
3-
4-
package telemetry_test
1+
package envtest
52

63
import (
74
"context"
@@ -38,7 +35,6 @@ import (
3835
"github.com/kong/kubernetes-ingress-controller/v2/internal/manager/telemetry"
3936
"github.com/kong/kubernetes-ingress-controller/v2/internal/util"
4037
"github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme"
41-
"github.com/kong/kubernetes-ingress-controller/v2/test/envtest"
4238
)
4339

4440
func TestTelemetry(t *testing.T) {
@@ -61,7 +57,7 @@ func TestTelemetry(t *testing.T) {
6157
go handleConnectionToTelemetryServer(ctx, t, listener, reportChan)
6258

6359
t.Log("configuring envtest and creating K8s objects for telemetry test")
64-
envcfg := envtest.Setup(t, scheme.Scheme)
60+
envcfg := Setup(t, scheme.Scheme)
6561
cfg := configForEnvTestTelemetry(t, envcfg)
6662
c, err := cfg.GetKubeconfig()
6763
require.NoError(t, err)
@@ -113,7 +109,7 @@ func configForEnvTestTelemetry(t *testing.T, envcfg *rest.Config) manager.Config
113109
cfg.APIServerCertData = envcfg.CertData
114110
cfg.APIServerKeyData = envcfg.KeyData
115111
cfg.APIServerCAData = envcfg.CAData
116-
cfg.KongAdminURLs = []string{envtest.StartAdminAPIServerMock(t).URL}
112+
cfg.KongAdminURLs = []string{StartAdminAPIServerMock(t).URL}
117113
cfg.UpdateStatus = false
118114
cfg.ProxySyncSeconds = 0.1
119115

0 commit comments

Comments
 (0)