Skip to content

Commit 00eeee4

Browse files
medyaghmedyagh
authored
Merge pull request #20363 from prezha/bumpK8sAPI-v0.32.1
Bump kubernetes packages to v0.32.1
2 parents cf3ab2a + 7e7f32f commit 00eeee4

File tree

4 files changed

+56
-21
lines changed

4 files changed

+56
-21
lines changed

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ require (
7777
gonum.org/v1/plot v0.15.0
7878
google.golang.org/api v0.217.0
7979
gopkg.in/yaml.v2 v2.4.0
80-
k8s.io/api v0.31.3
81-
k8s.io/apimachinery v0.32.0
82-
k8s.io/client-go v0.31.3
80+
k8s.io/api v0.32.1
81+
k8s.io/apimachinery v0.32.1
82+
k8s.io/client-go v0.32.1
8383
k8s.io/cluster-bootstrap v0.0.0
8484
k8s.io/component-base v0.31.3
8585
k8s.io/klog/v2 v2.130.1
@@ -164,7 +164,6 @@ require (
164164
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
165165
github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect
166166
github.com/huandu/xstrings v1.3.2 // indirect
167-
github.com/imdario/mergo v0.3.12 // indirect
168167
github.com/inconshreveable/mousetrap v1.1.0 // indirect
169168
github.com/jmespath/go-jmespath v0.4.0 // indirect
170169
github.com/josharian/intern v1.0.0 // indirect

‎go.sum

+6-8
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,6 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
14981498
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
14991499
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
15001500
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
1501-
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
15021501
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
15031502
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
15041503
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -3053,7 +3052,6 @@ google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpX
30533052
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
30543053
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
30553054
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
3056-
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw=
30573055
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
30583056
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
30593057
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -3140,8 +3138,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
31403138
k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk=
31413139
k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
31423140
k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
3143-
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
3144-
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
3141+
k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc=
3142+
k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k=
31453143
k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
31463144
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
31473145
k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
@@ -3150,8 +3148,8 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ
31503148
k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0=
31513149
k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
31523150
k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
3153-
k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
3154-
k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
3151+
k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
3152+
k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
31553153
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
31563154
k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
31573155
k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
@@ -3164,8 +3162,8 @@ k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k=
31643162
k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
31653163
k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y=
31663164
k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4=
3167-
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
3168-
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
3165+
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
3166+
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
31693167
k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI=
31703168
k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY=
31713169
k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=

‎pkg/minikube/service/service_test.go

+27-5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import (
3434
core "k8s.io/api/core/v1"
3535
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/apimachinery/pkg/util/intstr"
37+
corev1 "k8s.io/client-go/applyconfigurations/core/v1"
38+
"k8s.io/client-go/gentype"
3739
typed_core "k8s.io/client-go/kubernetes/typed/core/v1"
3840
"k8s.io/client-go/kubernetes/typed/core/v1/fake"
3941
testing_fake "k8s.io/client-go/testing"
@@ -63,8 +65,24 @@ func (m *MockClientGetter) GetCoreClient(string) (typed_core.CoreV1Interface, er
6365
secretsMap: m.secretsMap}, nil
6466
}
6567

66-
func (m *MockCoreClient) Secrets(_ string) typed_core.SecretInterface {
67-
return &fake.FakeSecrets{Fake: &fake.FakeCoreV1{Fake: &testing_fake.Fake{}}}
68+
func (m *MockCoreClient) Secrets(namespace string) typed_core.SecretInterface {
69+
return &MockSecretInterface{
70+
FakeClientWithListAndApply: gentype.NewFakeClientWithListAndApply[*core.Secret, *core.SecretList, *corev1.SecretApplyConfiguration](
71+
fake.FakeCoreV1{Fake: &testing_fake.Fake{}}.Fake,
72+
namespace,
73+
core.SchemeGroupVersion.WithResource("secrets"),
74+
core.SchemeGroupVersion.WithKind("Secret"),
75+
func() *core.Secret { return &core.Secret{} },
76+
func() *core.SecretList { return &core.SecretList{} },
77+
func(dst, src *core.SecretList) { dst.ListMeta = src.ListMeta },
78+
func(list *core.SecretList) []*core.Secret { return gentype.ToPointerSlice(list.Items) },
79+
func(list *core.SecretList, items []*core.Secret) { list.Items = gentype.FromPointerSlice(items) },
80+
),
81+
Fake: fake.FakeCoreV1{},
82+
SecretsList: &core.SecretList{
83+
Items: []core.Secret{},
84+
},
85+
}
6886
}
6987

7088
func (m *MockCoreClient) Services(namespace string) typed_core.ServiceInterface {
@@ -171,7 +189,8 @@ func (m *MockCoreClient) Endpoints(namespace string) typed_core.EndpointsInterfa
171189
}
172190

173191
type MockEndpointsInterface struct {
174-
fake.FakeEndpoints
192+
*gentype.FakeClientWithListAndApply[*core.Endpoints, *core.EndpointsList, *corev1.EndpointsApplyConfiguration]
193+
fake.FakeCoreV1
175194
Endpoints *core.Endpoints
176195
}
177196

@@ -227,12 +246,15 @@ func (e MockEndpointsInterface) Get(_ context.Context, name string, _ meta.GetOp
227246
}
228247

229248
type MockServiceInterface struct {
230-
fake.FakeServices
249+
*gentype.FakeClientWithListAndApply[*core.Service, *core.ServiceList, *corev1.ServiceApplyConfiguration]
250+
fake.FakeCoreV1
251+
typed_core.ServiceExpansion
231252
ServiceList *core.ServiceList
232253
}
233254

234255
type MockSecretInterface struct {
235-
fake.FakeSecrets
256+
*gentype.FakeClientWithListAndApply[*core.Secret, *core.SecretList, *corev1.SecretApplyConfiguration]
257+
Fake fake.FakeCoreV1
236258
SecretsList *core.SecretList
237259
}
238260

‎pkg/minikube/tunnel/loadbalancer_patcher_test.go

+20-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ import (
2424

2525
core "k8s.io/api/core/v1"
2626
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
27+
corev1 "k8s.io/client-go/applyconfigurations/core/v1"
28+
"k8s.io/client-go/gentype"
2729
typed_core "k8s.io/client-go/kubernetes/typed/core/v1"
2830
fake "k8s.io/client-go/kubernetes/typed/core/v1/fake"
2931
"k8s.io/client-go/rest"
32+
testing_fake "k8s.io/client-go/testing"
3033
)
3134

3235
type stubCoreClient struct {
@@ -35,10 +38,21 @@ type stubCoreClient struct {
3538
restClient *rest.RESTClient
3639
}
3740

38-
func (c *stubCoreClient) Services(_ string) typed_core.ServiceInterface {
41+
func (c *stubCoreClient) Services(namespace string) typed_core.ServiceInterface {
3942
return &stubServices{
40-
fake.FakeServices{Fake: &c.FakeCoreV1},
41-
c.servicesList,
43+
FakeClientWithListAndApply: gentype.NewFakeClientWithListAndApply[*core.Service, *core.ServiceList, *corev1.ServiceApplyConfiguration](
44+
fake.FakeCoreV1{Fake: &testing_fake.Fake{}}.Fake,
45+
namespace,
46+
core.SchemeGroupVersion.WithResource("services"),
47+
core.SchemeGroupVersion.WithKind("Service"),
48+
func() *core.Service { return &core.Service{} },
49+
func() *core.ServiceList { return &core.ServiceList{} },
50+
func(dst, src *core.ServiceList) { dst.ListMeta = src.ListMeta },
51+
func(list *core.ServiceList) []*core.Service { return gentype.ToPointerSlice(list.Items) },
52+
func(list *core.ServiceList, items []*core.Service) { list.Items = gentype.FromPointerSlice(items) },
53+
),
54+
Fake: fake.FakeCoreV1{},
55+
servicesList: c.servicesList,
4256
}
4357
}
4458

@@ -47,7 +61,9 @@ func (c *stubCoreClient) RESTClient() rest.Interface {
4761
}
4862

4963
type stubServices struct {
50-
fake.FakeServices
64+
*gentype.FakeClientWithListAndApply[*core.Service, *core.ServiceList, *corev1.ServiceApplyConfiguration]
65+
Fake fake.FakeCoreV1
66+
typed_core.ServiceExpansion
5167
servicesList *core.ServiceList
5268
}
5369

0 commit comments

Comments
 (0)