Skip to content

Commit c247ef0

Browse files
authored
Merge pull request #17245 from justinsb/stop_using_replace_for_client_go
chore: avoid replacing client-go version in tests/e2e
2 parents 0789af7 + ad14179 commit c247ef0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

tests/e2e/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ go 1.23.5
44

55
replace k8s.io/kops => ../../.
66

7-
// These should match the go.mod from k8s.io/kops
8-
replace k8s.io/client-go => k8s.io/client-go v0.31.0
9-
107
require (
118
github.com/blang/semver/v4 v4.0.0
129
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -296,7 +293,7 @@ require (
296293
gopkg.in/yaml.v2 v2.4.0 // indirect
297294
gopkg.in/yaml.v3 v3.0.1 // indirect
298295
k8s.io/api v0.31.1 // indirect
299-
k8s.io/client-go v11.0.0+incompatible // indirect
296+
k8s.io/client-go v0.31.1 // indirect
300297
k8s.io/cloud-provider v0.31.0 // indirect
301298
k8s.io/cloud-provider-gcp/providers v0.28.2 // indirect
302299
k8s.io/component-base v0.31.1 // indirect

tests/e2e/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,8 +1460,8 @@ k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
14601460
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
14611461
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
14621462
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
1463-
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
1464-
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
1463+
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
1464+
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
14651465
k8s.io/cloud-provider v0.31.0 h1:qNOs78I2/7zQmyStfDtY2M7EdilUl9fCSYMcqBju/tA=
14661466
k8s.io/cloud-provider v0.31.0/go.mod h1:QgUPqLoL6aXhLlrNg1U4IrJk/PvvxgeOnT2ixkgnqT0=
14671467
k8s.io/cloud-provider-gcp/providers v0.28.2 h1:I65pFTLNMQSj7YuW3Mg3pZIXmw0naCmF6TGAuz4/sZE=

0 commit comments

Comments
 (0)