Skip to content

Commit ac4c4e3

Browse files
zhiying-linzhiying-lin
authored
fix: bump golang.org/x/net from 0.33.0 to 0.36.0 (#277)
1 parent 9303eb6 commit ac4c4e3

19 files changed

+53
-48
lines changed

‎.github/workflows/build-publish-mcr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
# `public` indicates images to MCR wil be publicly available, and will be removed in the final MCR images
1818
REGISTRY_REPO: public/aks/fleet
1919

20-
GO_VERSION: '1.22.12'
20+
GO_VERSION: '1.23.0'
2121

2222
jobs:
2323
prepare-variables:

‎.github/workflows/e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
contents: read
1515

1616
env:
17-
GO_VERSION: '1.22.12'
17+
GO_VERSION: '1.23.0'
1818

1919
jobs:
2020
detect-noop:

‎.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
env:
1616
# Common versions
17-
GO_VERSION: '1.22.12'
17+
GO_VERSION: '1.23.0'
1818

1919
jobs:
2020

‎.github/workflows/publish-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
REGISTRY: ghcr.io
2020
IMAGE_VERSION: latest
2121

22-
GO_VERSION: '1.22.12'
22+
GO_VERSION: '1.23.0'
2323

2424
jobs:
2525
export-registry:

‎.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
MEMBER_NET_CONTROLLER_MANAGER_IMAGE_NAME: member-net-controller-manager
1919
MCS_CONTROLLER_MANAGER_IMAGE_NAME: mcs-controller-manager
2020

21-
GO_VERSION: '1.22.12'
21+
GO_VERSION: '1.23.0'
2222

2323
jobs:
2424
export-registry:

‎.github/workflows/unit-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
contents: read
1717

1818
env:
19-
GO_VERSION: '1.22.12'
19+
GO_VERSION: '1.23.0'
2020

2121
jobs:
2222
detect-noop:

‎.golangci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
run:
2-
deadline: 10m
2+
timeout: 15m
3+
4+
linters-settings:
5+
stylecheck:
6+
checks: ["all", "-ST1001"] # Disables dot-import warnings
7+
revive:
8+
rules:
9+
- name: dot-imports
10+
disabled: true
311

412
linters:
513
disable-all: true
614
enable:
7-
- deadcode
815
- errcheck
916
- errorlint
1017
- goconst
@@ -21,9 +28,7 @@ linters:
2128
- prealloc
2229
- revive
2330
- staticcheck
24-
- structcheck
2531
- typecheck
2632
- unconvert
2733
- unused
28-
- varcheck
2934
- whitespace

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ GOIMPORTS_VER := latest
3232
GOIMPORTS_BIN := goimports
3333
GOIMPORTS := $(abspath $(TOOLS_BIN_DIR)/$(GOIMPORTS_BIN)-$(GOIMPORTS_VER))
3434

35-
GOLANGCI_LINT_VER := v1.52.2
35+
GOLANGCI_LINT_VER := v1.64.7
3636
GOLANGCI_LINT_BIN := golangci-lint
3737
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
3838

‎docker/hub-net-controller-manager.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.12 as builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.0 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎docker/mcs-controller-manager.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.12 as builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.0 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎docker/member-net-controller-manager.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.12 as builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.23.0 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.goms.io/fleet-networking
22

3-
go 1.22.12
3+
go 1.23.0
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
@@ -13,7 +13,7 @@ require (
1313
github.com/prometheus/client_golang v1.19.1
1414
github.com/prometheus/common v0.55.0
1515
github.com/stretchr/testify v1.10.0
16-
golang.org/x/sync v0.10.0
16+
golang.org/x/sync v0.11.0
1717
k8s.io/api v0.31.1
1818
k8s.io/apimachinery v0.31.1
1919
k8s.io/client-go v0.31.1
@@ -89,13 +89,13 @@ require (
8989
go.opentelemetry.io/otel/metric v1.31.0 // indirect
9090
go.uber.org/multierr v1.11.0 // indirect
9191
go.uber.org/zap v1.27.0 // indirect
92-
golang.org/x/crypto v0.31.0 // indirect
92+
golang.org/x/crypto v0.35.0 // indirect
9393
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
94-
golang.org/x/net v0.33.0 // indirect
94+
golang.org/x/net v0.36.0 // indirect
9595
golang.org/x/oauth2 v0.23.0 // indirect
96-
golang.org/x/sys v0.28.0 // indirect
97-
golang.org/x/term v0.27.0 // indirect
98-
golang.org/x/text v0.21.0 // indirect
96+
golang.org/x/sys v0.30.0 // indirect
97+
golang.org/x/term v0.29.0 // indirect
98+
golang.org/x/text v0.22.0 // indirect
9999
golang.org/x/time v0.7.0 // indirect
100100
golang.org/x/tools v0.28.0 // indirect
101101
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
212212
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
213213
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
214214
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
215-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
216-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
215+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
216+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
217217
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw=
218218
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
219219
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -227,16 +227,16 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
227227
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
228228
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
229229
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
230-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
231-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
230+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
231+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
232232
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
233233
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
234234
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
235235
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
236236
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
237237
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
238-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
239-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
238+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
239+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
240240
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
241241
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
242242
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -247,20 +247,20 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
247247
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
248248
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
249249
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
250-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
251-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
250+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
251+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
252252
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
253253
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
254254
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
255-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
256-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
255+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
256+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
257257
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
258258
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
259259
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
260260
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
261261
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
262-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
263-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
262+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
263+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
264264
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
265265
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
266266
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎pkg/common/hubconfig/hubconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func PrepareHubConfig(tlsClientInsecure bool) (*rest.Config, error) {
5353
}
5454

5555
// Retry on obtaining token file as it is created asynchronously by token-refesh container
56-
if err := retry.OnError(retry.DefaultRetry, func(e error) bool {
56+
if err := retry.OnError(retry.DefaultRetry, func(_ error) bool {
5757
return true
5858
}, func() error {
5959
// Stat returns file info. It will return an error if there is no file.

‎pkg/common/hubconfig/hubconfig_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestPrepareHubConfig(t *testing.T) {
3333
name: "environment variable `HUB_SERVER_URL` is not present - error",
3434
environmentVariables: map[string]string{tokenConfigPathEnvKey: fakeConfigtokenConfigPathEnvVal, hubCAEnvKey: fakeCerhubCAEnvVal},
3535
tlsClientInsecure: false,
36-
validate: func(t *testing.T, config *rest.Config, err error) {
36+
validate: func(t *testing.T, _ *rest.Config, err error) {
3737
if err == nil {
3838
t.Errorf("expect return error if HUB_SERVER_URL not present")
3939
}
@@ -43,7 +43,7 @@ func TestPrepareHubConfig(t *testing.T) {
4343
name: "environment variable `CONFIG_PATH` is not present - error",
4444
environmentVariables: map[string]string{hubServerURLEnvKey: fakeHubhubServerURLEnvVal, hubCAEnvKey: fakeCerhubCAEnvVal},
4545
tlsClientInsecure: false,
46-
validate: func(t *testing.T, config *rest.Config, err error) {
46+
validate: func(t *testing.T, _ *rest.Config, err error) {
4747
if err == nil {
4848
t.Errorf("expect return error if CONFIG_PATH not present")
4949
}
@@ -128,7 +128,7 @@ func TestPrepareHubConfig(t *testing.T) {
128128
name: "environment variable `HUB_KUBE_HEADER` has wrong format - error",
129129
environmentVariables: map[string]string{hubServerURLEnvKey: fakeHubhubServerURLEnvVal, hubKubeHeaderEnvKey: "wrong header format", tokenConfigPathEnvKey: fakeConfigtokenConfigPathEnvVal},
130130
tlsClientInsecure: true,
131-
validate: func(t *testing.T, config *rest.Config, err error) {
131+
validate: func(t *testing.T, _ *rest.Config, err error) {
132132
if err == nil {
133133
t.Errorf("expect error about wrong header format but not")
134134
}

‎pkg/controllers/hub/membercluster/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ func (r *Reconciler) removeFinalizer(ctx context.Context, mc clusterv1beta1.Memb
111111
// SetupWithManager sets up the controller with the Manager.
112112
func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
113113
customPredicate := predicate.Funcs{
114-
CreateFunc: func(e event.CreateEvent) bool {
114+
CreateFunc: func(_ event.CreateEvent) bool {
115115
// Ignore creation events.
116116
return false
117117
},
118-
DeleteFunc: func(e event.DeleteEvent) bool {
118+
DeleteFunc: func(_ event.DeleteEvent) bool {
119119
// trigger reconcile on delete event just in case update event is missed.
120120
return true
121121
},

‎test/common/trafficmanager/fakeprovider/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func ProfileCreateOrUpdate(_ context.Context, resourceGroupName string, profileN
178178
if parameters.Properties.MonitorConfig.IntervalInSeconds != nil && *parameters.Properties.MonitorConfig.IntervalInSeconds == 10 {
179179
if parameters.Properties.MonitorConfig.TimeoutInSeconds != nil && *parameters.Properties.MonitorConfig.TimeoutInSeconds > 9 {
180180
errResp.SetResponseError(http.StatusBadRequest, "BadRequestError")
181-
return
181+
return resp, errResp
182182
}
183183
}
184184
profileResp := armtrafficmanager.ProfilesClientCreateOrUpdateResponse{

‎test/e2e/framework/objects.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Namespace(name string) *corev1.Namespace {
1919
}
2020

2121
// ClusterIPServiceWithNoSelector returns a Cluster IP type Service object with no selector specified.
22-
func ClusterIPServiceWithNoSelector(namespace, name, portName string, port, targetPort int) *corev1.Service {
22+
func ClusterIPServiceWithNoSelector(namespace, name, portName string, port, targetPort int32) *corev1.Service {
2323
return &corev1.Service{
2424
ObjectMeta: metav1.ObjectMeta{
2525
Namespace: namespace,
@@ -30,8 +30,8 @@ func ClusterIPServiceWithNoSelector(namespace, name, portName string, port, targ
3030
Ports: []corev1.ServicePort{
3131
{
3232
Name: portName,
33-
Port: int32(port),
34-
TargetPort: intstr.FromInt(targetPort),
33+
Port: port,
34+
TargetPort: intstr.FromInt32(targetPort),
3535
},
3636
},
3737
},

‎test/perftest/latency/peak/latency_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ var (
4747
fleetSystemNS = "fleet-system"
4848
svcName = "app"
4949
svcPortName = "http"
50-
svcPort = 80
51-
svcTargetPort = 8080
50+
svcPort = int32(80)
51+
svcTargetPort = int32(8080)
5252
endpointSliceName = "app-endpointslice"
5353
endpointAddr = "1.2.3.4"
5454

@@ -116,7 +116,7 @@ var _ = Describe("evaluate service export and endpointslice export/import latenc
116116
})
117117

118118
It("propagate an endpointSlice", func() {
119-
endpointSlice := framework.ManuallyManagedIPv4EndpointSlice(workNS, endpointSliceName, svcName, svcPortName, int32(svcTargetPort), []string{endpointAddr})
119+
endpointSlice := framework.ManuallyManagedIPv4EndpointSlice(workNS, endpointSliceName, svcName, svcPortName, svcTargetPort, []string{endpointAddr})
120120
Expect(memberCluster1Client.Create(ctx, endpointSlice)).Should(Succeed(), "Failed to create endpointSlice %s in cluster %s", endpointSliceName, memberCluster1.Name())
121121

122122
// Wait until the endpointSlice is imported.
@@ -252,7 +252,7 @@ var _ = Describe("evaluate service export and endpointslice export/import latenc
252252
})
253253

254254
It("propagate an endpointSlice", func() {
255-
endpointSlice := framework.ManuallyManagedIPv4EndpointSlice(workNS, endpointSliceName, svcName, svcPortName, int32(svcTargetPort), []string{endpointAddr})
255+
endpointSlice := framework.ManuallyManagedIPv4EndpointSlice(workNS, endpointSliceName, svcName, svcPortName, svcTargetPort, []string{endpointAddr})
256256
Expect(memberCluster2Client.Create(ctx, endpointSlice)).Should(Succeed(), "Failed to create endpointSlice %s in cluster %s", endpointSliceName, memberCluster2.Name())
257257

258258
// Wait until the endpointSlice is imported.
@@ -385,7 +385,7 @@ var _ = Describe("evaluate service export and endpointslice export/import latenc
385385
multiClusterSvc: framework.MultiClusterService(workNS, svcName, svcName),
386386
multiClusterSvcOwnerClusterIdx: i % 4,
387387
endpointSlice: framework.ManuallyManagedIPv4EndpointSlice(
388-
workNS, endpointSliceName, svcName, svcPortName, int32(svcTargetPort), []string{fmt.Sprintf(endpointSliceAddrTpl, 255)}),
388+
workNS, endpointSliceName, svcName, svcPortName, svcTargetPort, []string{fmt.Sprintf(endpointSliceAddrTpl, 255)}),
389389
}
390390
workRecords = append(workRecords, w)
391391
}

0 commit comments

Comments
 (0)