Skip to content

Commit aae22ba

Browse files
build(deps): bump the kube group with 8 updates - update related tests (#14817)
* build(deps): bump the kube group with 8 updates Bumps the kube group with 8 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.34.3` | `0.35.0` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.34.3` | `0.35.0` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.34.3` | `0.35.0` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.3` | `0.35.0` | | [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.34.3` | `0.35.0` | | [k8s.io/endpointslice](https://github.com/kubernetes/endpointslice) | `0.34.3` | `0.35.0` | | [k8s.io/kube-aggregator](https://github.com/kubernetes/kube-aggregator) | `0.34.3` | `0.35.0` | | [k8s.io/utils](https://github.com/kubernetes/utils) | `0.0.0-20250604170112-4c0f3b243397` | `0.0.0-20251002143259-bc988d571ff4` | Updates `k8s.io/api` from 0.34.3 to 0.35.0 - [Commits](kubernetes/api@v0.34.3...v0.35.0) Updates `k8s.io/apiextensions-apiserver` from 0.34.3 to 0.35.0 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.34.3...v0.35.0) Updates `k8s.io/apimachinery` from 0.34.3 to 0.35.0 - [Commits](kubernetes/apimachinery@v0.34.3...v0.35.0) Updates `k8s.io/client-go` from 0.34.3 to 0.35.0 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.34.3...v0.35.0) Updates `k8s.io/code-generator` from 0.34.3 to 0.35.0 - [Commits](kubernetes/code-generator@v0.34.3...v0.35.0) Updates `k8s.io/endpointslice` from 0.34.3 to 0.35.0 - [Commits](kubernetes/endpointslice@v0.34.3...v0.35.0) Updates `k8s.io/kube-aggregator` from 0.34.3 to 0.35.0 - [Commits](kubernetes/kube-aggregator@v0.34.3...v0.35.0) Updates `k8s.io/utils` from 0.0.0-20250604170112-4c0f3b243397 to 0.0.0-20251002143259-bc988d571ff4 - [Commits](https://github.com/kubernetes/utils/commits) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/apimachinery dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/client-go dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/code-generator dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/endpointslice dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/kube-aggregator dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kube - dependency-name: k8s.io/utils dependency-version: 0.0.0-20251002143259-bc988d571ff4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kube ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): fix tests following k8s `v0.35.0` update (#14827) Fix `EndpointPort` ordering in tests: The `EndpointPort` struct in `v0.35.0` added a new `AppProtocol` field, causing `NewPortMapKey` hashing function to change, causing test ordering output to change. Run `update-codegen.sh` for `v0.35.0` Fix healthcheck test: Pass `kubernetes.Interface` into `NewClusterScopedAPI` so the informer will see the fake clientset implements `IsWatchListSemanticsUnSupported`. Fix go lint Signed-off-by: Andrew Seigner <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Andrew Seigner <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Seigner <[email protected]>
1 parent e644230 commit aae22ba

File tree

32 files changed

+375
-243
lines changed

32 files changed

+375
-243
lines changed

.golangci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,17 @@ issues:
159159
- path: pkg/k8s/fake.go
160160
text: Error return value is not checked
161161

162-
# Ignore Endpoints and EndpointSubset deprecation warnings for now.
162+
# Ignore NewSimpleClientset, Endpoints, EndpointSubset, and NewGone
163+
# deprecation warnings for now.
163164
- linters:
164165
- staticcheck
165166
text: "corev1.Endpoints is deprecated: This API is deprecated in v1.33+"
166167
- linters:
167168
- staticcheck
168169
text: "corev1.EndpointSubset is deprecated: This API is deprecated in v1.33+"
170+
- linters:
171+
- staticcheck
172+
text: "fake.NewSimpleClientset is deprecated"
173+
- linters:
174+
- staticcheck
175+
text: "k8sError.NewGone is deprecated"

controller/api/destination/external-workload/endpoints_controller_test.go

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -451,16 +451,16 @@ func TestSyncService(t *testing.T) {
451451
Protocol: protoPtr(v1.ProtocolUDP),
452452
Port: ptr.To(int32(161)),
453453
},
454-
{
455-
Name: ptr.To("sctp-example"),
456-
Protocol: protoPtr(v1.ProtocolSCTP),
457-
Port: ptr.To(int32(3456)),
458-
},
459454
{
460455
Name: ptr.To("tcp-example"),
461456
Protocol: protoPtr(v1.ProtocolTCP),
462457
Port: ptr.To(int32(80)),
463458
},
459+
{
460+
Name: ptr.To("sctp-example"),
461+
Protocol: protoPtr(v1.ProtocolSCTP),
462+
Port: ptr.To(int32(3456)),
463+
},
464464
},
465465
expectedEndpoints: []discoveryv1.Endpoint{
466466
{
@@ -569,16 +569,16 @@ func TestSyncService(t *testing.T) {
569569
Protocol: protoPtr(v1.ProtocolUDP),
570570
Port: ptr.To(int32(161)),
571571
},
572-
{
573-
Name: ptr.To("sctp-example"),
574-
Protocol: protoPtr(v1.ProtocolSCTP),
575-
Port: ptr.To(int32(3456)),
576-
},
577572
{
578573
Name: ptr.To("tcp-example"),
579574
Protocol: protoPtr(v1.ProtocolTCP),
580575
Port: ptr.To(int32(80)),
581576
},
577+
{
578+
Name: ptr.To("sctp-example"),
579+
Protocol: protoPtr(v1.ProtocolSCTP),
580+
Port: ptr.To(int32(3456)),
581+
},
582582
},
583583
expectedEndpoints: []discoveryv1.Endpoint{
584584
{
@@ -678,16 +678,16 @@ func TestSyncService(t *testing.T) {
678678
Protocol: protoPtr(v1.ProtocolUDP),
679679
Port: ptr.To(int32(161)),
680680
},
681-
{
682-
Name: ptr.To("sctp-example"),
683-
Protocol: protoPtr(v1.ProtocolSCTP),
684-
Port: ptr.To(int32(3456)),
685-
},
686681
{
687682
Name: ptr.To("tcp-example"),
688683
Protocol: protoPtr(v1.ProtocolTCP),
689684
Port: ptr.To(int32(80)),
690685
},
686+
{
687+
Name: ptr.To("sctp-example"),
688+
Protocol: protoPtr(v1.ProtocolSCTP),
689+
Port: ptr.To(int32(3456)),
690+
},
691691
},
692692
expectedEndpoints: []discoveryv1.Endpoint{
693693
{
@@ -792,16 +792,16 @@ func TestSyncService(t *testing.T) {
792792
Protocol: protoPtr(v1.ProtocolUDP),
793793
Port: ptr.To(int32(161)),
794794
},
795-
{
796-
Name: ptr.To("sctp-example"),
797-
Protocol: protoPtr(v1.ProtocolSCTP),
798-
Port: ptr.To(int32(3456)),
799-
},
800795
{
801796
Name: ptr.To("tcp-example"),
802797
Protocol: protoPtr(v1.ProtocolTCP),
803798
Port: ptr.To(int32(80)),
804799
},
800+
{
801+
Name: ptr.To("sctp-example"),
802+
Protocol: protoPtr(v1.ProtocolSCTP),
803+
Port: ptr.To(int32(3456)),
804+
},
805805
},
806806
expectedEndpoints: []discoveryv1.Endpoint{
807807
{
@@ -862,6 +862,26 @@ func TestSyncService(t *testing.T) {
862862

863863
if !reflect.DeepEqual(testcase.expectedEndpointPorts, slice.Ports) {
864864
t.Error("actual ports do not match expected ones")
865+
866+
for i, ep := range slice.Ports {
867+
t.Logf(
868+
"actual port[%d]: name=%s proto=%v port=%v",
869+
i,
870+
ptr.Deref(ep.Name, "<nil>"),
871+
ptr.Deref(ep.Protocol, "<nil>"),
872+
ptr.Deref(ep.Port, 0),
873+
)
874+
}
875+
876+
for i, ep := range testcase.expectedEndpointPorts {
877+
t.Logf(
878+
"expected port[%d]: name=%s proto=%v port=%v",
879+
i,
880+
ptr.Deref(ep.Name, "<nil>"),
881+
ptr.Deref(ep.Protocol, "<nil>"),
882+
ptr.Deref(ep.Port, 0),
883+
)
884+
}
865885
}
866886

867887
// sort actual endpoints in terms of targetRef name, in ascending

controller/gen/client/clientset/versioned/fake/clientset_generated.go

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

controller/gen/client/clientset/versioned/typed/externalworkload/v1beta1/externalworkload_client.go

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

controller/gen/client/clientset/versioned/typed/link/v1alpha1/link_client.go

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

controller/gen/client/clientset/versioned/typed/link/v1alpha2/link_client.go

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

controller/gen/client/clientset/versioned/typed/link/v1alpha3/link_client.go

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

controller/gen/client/clientset/versioned/typed/policy/v1alpha1/policy_client.go

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

0 commit comments

Comments
 (0)