Skip to content

Commit a8d2b19

Browse files
r2k1Copilot
andauthored
chore(e2e): bump client-go to v0.36.1, Go to 1.26.4, switch pod exec to WebSocket (#8628)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 3c6601e commit a8d2b19

4 files changed

Lines changed: 85 additions & 100 deletions

File tree

.github/workflows/validate-components.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
- uses: actions/checkout@v6
4646
- uses: actions/setup-go@v6
4747
with:
48-
go-version: '1.25'
48+
go-version-file: e2e/go.mod
49+
cache-dependency-path: e2e/go.sum
4950
- name: Run GPU managed components version consistency test
5051
working-directory: ./e2e
5152
run: |

e2e/exec.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func execOnPod(ctx context.Context, kube *Kubeclient, namespace, podName string,
220220
}
221221

222222
func attemptExecOnPod(ctx context.Context, kube *Kubeclient, namespace, podName string, command []string) (*podExecResult, error) {
223-
req := kube.Typed.CoreV1().RESTClient().Post().Resource("pods").Name(podName).Namespace(namespace).SubResource("exec")
223+
req := kube.Typed.CoreV1().RESTClient().Get().Resource("pods").Name(podName).Namespace(namespace).SubResource("exec")
224224

225225
option := &corev1.PodExecOptions{
226226
Command: command,
@@ -233,9 +233,9 @@ func attemptExecOnPod(ctx context.Context, kube *Kubeclient, namespace, podName
233233
scheme.ParameterCodec,
234234
)
235235

236-
exec, err := remotecommand.NewSPDYExecutor(kube.RESTConfig, "POST", req.URL())
236+
exec, err := remotecommand.NewWebSocketExecutor(kube.RESTConfig, "GET", req.URL().String())
237237
if err != nil {
238-
return nil, fmt.Errorf("unable to create new SPDY executor for pod exec: %w", err)
238+
return nil, fmt.Errorf("unable to create new WebSocket executor for pod exec: %w", err)
239239
}
240240

241241
var (

e2e/go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/agentbaker/e2e
22

3-
go 1.25.10
3+
go 1.26.4
44

55
require (
66
github.com/Azure/agentbaker v0.20240503.0
@@ -30,10 +30,10 @@ require (
3030
github.com/stretchr/testify v1.11.1
3131
github.com/tidwall/gjson v1.18.0
3232
golang.org/x/crypto v0.51.0
33-
k8s.io/api v0.34.2
34-
k8s.io/apimachinery v0.34.2
35-
k8s.io/client-go v0.34.2
36-
sigs.k8s.io/controller-runtime v0.20.4
33+
k8s.io/api v0.36.1
34+
k8s.io/apimachinery v0.36.1
35+
k8s.io/client-go v0.36.1
36+
sigs.k8s.io/controller-runtime v0.24.1
3737
)
3838

3939
require (
@@ -44,33 +44,34 @@ require (
4444
github.com/coreos/butane v0.25.1 // indirect
4545
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
4646
github.com/coreos/go-semver v0.3.1 // indirect
47-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
47+
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
4848
github.com/coreos/ignition/v2 v2.23.0 // indirect
4949
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
5050
github.com/go-logr/zapr v1.3.0 // indirect
5151
github.com/vincent-petithory/dataurl v1.0.0 // indirect
5252
go.uber.org/multierr v1.11.0 // indirect
53-
go.uber.org/zap v1.27.0 // indirect
54-
go.yaml.in/yaml/v2 v2.4.2 // indirect
53+
go.uber.org/zap v1.27.1 // indirect
54+
go.yaml.in/yaml/v2 v2.4.3 // indirect
5555
go.yaml.in/yaml/v3 v3.0.4 // indirect
56-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
56+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
57+
k8s.io/apiextensions-apiserver v0.36.1 // indirect
58+
k8s.io/streaming v0.36.1 // indirect
5759
sigs.k8s.io/randfill v1.0.0 // indirect
58-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
60+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
5961
sigs.k8s.io/yaml v1.6.0 // indirect
6062
)
6163

6264
require (
6365
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
6466
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
6567
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
66-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
68+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
6769
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6870
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6971
github.com/go-logr/logr v1.4.3 // indirect
7072
github.com/go-openapi/jsonpointer v0.21.1 // indirect
7173
github.com/go-openapi/jsonreference v0.21.0 // indirect
7274
github.com/go-openapi/swag v0.23.1 // indirect
73-
github.com/gogo/protobuf v1.3.2 // indirect
7475
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
7576
github.com/google/gnostic-models v0.7.0 // indirect
7677
github.com/google/uuid v1.6.0
@@ -83,7 +84,6 @@ require (
8384
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8485
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8586
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
86-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8787
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
8888
github.com/pkg/errors v0.9.1 // indirect
8989
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -92,18 +92,18 @@ require (
9292
github.com/tidwall/pretty v1.2.1 // indirect
9393
github.com/x448/float16 v0.8.4 // indirect
9494
golang.org/x/net v0.55.0
95-
golang.org/x/oauth2 v0.30.0 // indirect
95+
golang.org/x/oauth2 v0.34.0 // indirect
9696
golang.org/x/sys v0.45.0 // indirect
9797
golang.org/x/term v0.43.0 // indirect
9898
golang.org/x/text v0.37.0 // indirect
99-
golang.org/x/time v0.12.0 // indirect
100-
google.golang.org/protobuf v1.36.6 // indirect
99+
golang.org/x/time v0.14.0 // indirect
100+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
101101
gopkg.in/inf.v0 v0.9.1 // indirect
102102
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/klog/v2 v2.130.1 // indirect
104-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
105-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
106-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
103+
k8s.io/klog/v2 v2.140.0 // indirect
104+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
105+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
106+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
107107
)
108108

109109
replace github.com/Azure/agentbaker => ../

0 commit comments

Comments
 (0)