Skip to content

Commit 8a5c5e3

Browse files
hendrikKahlhendrikKahl
authored
Update Go version and Controller Runtime (#934)
* Update Golang version to 1.26.1 * Bump controller runtime and OCM versions * Adjust validator to use generics * Update env test version to 1.35
1 parent 03eb349 commit 8a5c5e3

8 files changed

Lines changed: 163 additions & 157 deletions

File tree

‎.test-defs/conformanceTestgrid.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
export E2E_EXPORT_PATH=$TM_EXPORT_PATH &&
4343
export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/shoot.config &&
4444
go run ./conformance-tests
45-
image: golang:1.26.0
45+
image: golang:1.26.1
4646
resources:
4747
requests:
4848
memory: "500Mi"

‎.test-defs/conformanceTestgridParallel.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
export E2E_EXPORT_PATH=$TM_EXPORT_PATH &&
2727
export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/shoot.config &&
2828
go run ./conformance-tests --flakeAttempts=5
29-
image: golang:1.26.0
29+
image: golang:1.26.1
3030
resources:
3131
requests:
3232
memory: "500Mi"

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TM_CONTROLLER_CHART := testmachinery-controller
1818
VERSION ?= $(shell cat ${REPO_ROOT}/VERSION)
1919
IMAGE_TAG := ${VERSION}
2020

21-
ENVTEST_K8S_VERSION := 1.33.x
21+
ENVTEST_K8S_VERSION := 1.35.x
2222

2323
TM_RUN_IMAGE := $(REGISTRY)/testmachinery-run
2424
TM_BOT_IMAGE := $(REGISTRY)/bot

‎cmd/testmachinery-controller/app/app.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ func (o *options) run(ctx context.Context) {
7575
webhooks.StartHealthCheck(ctx, mgr.GetAPIReader(), config.Controller.DependencyHealthCheck.Namespace, config.Controller.DependencyHealthCheck.DeploymentName, config.Controller.DependencyHealthCheck.Interval)
7676
o.log.Info("Setup webhooks")
7777
// TODO use https://github.com/kubernetes-sigs/controller-runtime/pull/2998 when it becomes available in the controller-runtime
78-
if err := builder.WebhookManagedBy(mgr).
79-
For(&v1beta1.Testrun{}).
78+
if err := builder.WebhookManagedBy(mgr, &v1beta1.Testrun{}).
8079
WithValidator(&webhooks.TestRunCustomValidator{Log: logger.Log.WithName("validator")}).
8180
Complete(); err != nil {
8281
o.log.Error(err, "unable to create webhook to validate TestRuns")

‎go.mod‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/gardener/test-infra
22

3-
go 1.26.0
3+
go 1.26.1
44

55
require (
66
cloud.google.com/go/storage v1.61.3
@@ -43,8 +43,8 @@ require (
4343
k8s.io/client-go v0.35.2
4444
k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf
4545
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
46-
ocm.software/ocm v0.35.0
47-
sigs.k8s.io/controller-runtime v0.22.5
46+
ocm.software/ocm v0.37.0
47+
sigs.k8s.io/controller-runtime v0.23.1
4848
sigs.k8s.io/yaml v1.6.0
4949
)
5050

@@ -96,31 +96,31 @@ require (
9696
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
9797
github.com/aws/aws-sdk-go-v2 v1.41.1 // indirect
9898
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
99-
github.com/aws/aws-sdk-go-v2/config v1.32.7 // indirect
100-
github.com/aws/aws-sdk-go-v2/credentials v1.19.7 // indirect
99+
github.com/aws/aws-sdk-go-v2/config v1.32.9 // indirect
100+
github.com/aws/aws-sdk-go-v2/credentials v1.19.9 // indirect
101101
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
102-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.13 // indirect
102+
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.1.4 // indirect
103103
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
104104
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
105105
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
106106
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 // indirect
107-
github.com/aws/aws-sdk-go-v2/service/ecr v1.54.2 // indirect
107+
github.com/aws/aws-sdk-go-v2/service/ecr v1.55.2 // indirect
108108
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.38.2 // indirect
109109
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
110110
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 // indirect
111111
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
112112
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 // indirect
113-
github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1 // indirect
113+
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0 // indirect
114114
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
115-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
116-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
115+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.10 // indirect
116+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.14 // indirect
117117
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
118118
github.com/aws/smithy-go v1.24.0 // indirect
119-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.10.1 // indirect
119+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.11.0 // indirect
120120
github.com/beorn7/perks v1.0.1 // indirect
121121
github.com/blang/semver v3.5.1+incompatible // indirect
122122
github.com/blang/semver/v4 v4.0.0 // indirect
123-
github.com/buildkite/agent/v3 v3.111.0 // indirect
123+
github.com/buildkite/agent/v3 v3.115.4 // indirect
124124
github.com/buildkite/go-pipeline v0.16.0 // indirect
125125
github.com/buildkite/interpolate v0.1.5 // indirect
126126
github.com/buildkite/roko v1.4.0 // indirect
@@ -164,23 +164,25 @@ require (
164164
github.com/docker/go-events v0.0.0-20250808211157-605354379745 // indirect
165165
github.com/docker/go-units v0.5.0 // indirect
166166
github.com/dustin/go-humanize v1.0.1 // indirect
167+
github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
167168
github.com/elliotchance/orderedmap v1.8.0 // indirect
168169
github.com/elliotchance/orderedmap/v3 v3.1.0 // indirect
169170
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
170171
github.com/emirpasic/gods v1.18.1 // indirect
171172
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
172173
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
173-
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
174174
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
175175
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
176+
github.com/extism/go-sdk v1.7.1 // indirect
176177
github.com/fatih/color v1.18.0 // indirect
177178
github.com/felixge/httpsnoop v1.0.4 // indirect
179+
github.com/fluxcd/cli-utils v0.37.1-flux.1 // indirect
178180
github.com/fvbommel/sortorder v1.1.0 // indirect
179181
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
180182
github.com/go-chi/chi/v5 v5.2.4 // indirect
181183
github.com/go-errors/errors v1.5.1 // indirect
182184
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
183-
github.com/go-git/go-billy/v5 v5.6.2 // indirect
185+
github.com/go-git/go-billy/v5 v5.7.0 // indirect
184186
github.com/go-git/go-git/v5 v5.16.5 // indirect
185187
github.com/go-ini/ini v1.67.0 // indirect
186188
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
@@ -208,7 +210,7 @@ require (
208210
github.com/go-openapi/validate v0.25.1 // indirect
209211
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
210212
github.com/go-test/deep v1.1.1 // indirect
211-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
213+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
212214
github.com/gobuffalo/flect v1.0.3 // indirect
213215
github.com/gobwas/glob v0.2.4-0.20181002190808-e7a84e9525fe // indirect
214216
github.com/goccy/go-json v0.10.5 // indirect
@@ -236,14 +238,15 @@ require (
236238
github.com/gorilla/securecookie v1.1.2 // indirect
237239
github.com/gowebpki/jcs v1.0.1 // indirect
238240
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
239-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
241+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.5 // indirect
240242
github.com/hashicorp/errwrap v1.1.0 // indirect
241243
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
242244
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
243245
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
244246
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
245247
github.com/hashicorp/vault-client-go v0.4.3 // indirect
246248
github.com/huandu/xstrings v1.5.0 // indirect
249+
github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b // indirect
247250
github.com/in-toto/attestation v1.1.2 // indirect
248251
github.com/in-toto/in-toto-golang v0.9.0 // indirect
249252
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -252,7 +255,7 @@ require (
252255
github.com/jinzhu/copier v0.4.0 // indirect
253256
github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 // indirect
254257
github.com/kevinburke/ssh_config v1.4.0 // indirect
255-
github.com/klauspost/compress v1.18.2 // indirect
258+
github.com/klauspost/compress v1.18.4 // indirect
256259
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
257260
github.com/klauspost/pgzip v1.2.6 // indirect
258261
github.com/letsencrypt/boulder v0.20251110.0 // indirect
@@ -266,16 +269,16 @@ require (
266269
github.com/mattn/go-colorable v0.1.14 // indirect
267270
github.com/mattn/go-isatty v0.0.20 // indirect
268271
github.com/mattn/go-runewidth v0.0.19 // indirect
269-
github.com/miekg/pkcs11 v1.1.1 // indirect
272+
github.com/miekg/pkcs11 v1.1.2 // indirect
270273
github.com/mikefarah/yq/v4 v4.48.1 // indirect
271274
github.com/mitchellh/copystructure v1.2.0 // indirect
272275
github.com/mitchellh/go-homedir v1.1.0 // indirect
273276
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
274277
github.com/mitchellh/reflectwalk v1.0.2 // indirect
275278
github.com/moby/docker-image-spec v1.3.1 // indirect
276279
github.com/moby/locker v1.0.1 // indirect
277-
github.com/moby/moby/api v1.52.0 // indirect
278-
github.com/moby/moby/client v0.2.1 // indirect
280+
github.com/moby/moby/api v1.53.0 // indirect
281+
github.com/moby/moby/client v0.2.2 // indirect
279282
github.com/moby/sys/atomicwriter v0.1.0 // indirect
280283
github.com/moby/sys/capability v0.4.0 // indirect
281284
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -307,7 +310,7 @@ require (
307310
github.com/prometheus/client_model v0.6.2 // indirect
308311
github.com/prometheus/common v0.67.5 // indirect
309312
github.com/prometheus/procfs v0.19.2 // indirect
310-
github.com/redis/go-redis/v9 v9.17.2 // indirect
313+
github.com/redis/go-redis/v9 v9.18.0 // indirect
311314
github.com/russross/blackfriday/v2 v2.1.0 // indirect
312315
github.com/ryanuber/go-glob v1.0.0 // indirect
313316
github.com/sagikazarmark/locafero v0.12.0 // indirect
@@ -317,20 +320,22 @@ require (
317320
github.com/sergi/go-diff v1.4.0 // indirect
318321
github.com/shibumi/go-pathspec v1.3.0 // indirect
319322
github.com/shopspring/decimal v1.4.0 // indirect
320-
github.com/sigstore/cosign/v2 v2.6.2 // indirect
323+
github.com/sigstore/cosign/v3 v3.0.5 // indirect
321324
github.com/sigstore/fulcio v1.8.5 // indirect
322325
github.com/sigstore/protobuf-specs v0.5.0 // indirect
323326
github.com/sigstore/rekor v1.5.0 // indirect
324-
github.com/sigstore/rekor-tiles/v2 v2.0.1 // indirect
327+
github.com/sigstore/rekor-tiles/v2 v2.2.0 // indirect
325328
github.com/sigstore/sigstore v1.10.4 // indirect
326329
github.com/sigstore/sigstore-go v1.1.4 // indirect
327-
github.com/sigstore/timestamp-authority/v2 v2.0.3 // indirect
330+
github.com/sigstore/timestamp-authority/v2 v2.0.4 // indirect
328331
github.com/skeema/knownhosts v1.3.2 // indirect
329332
github.com/spf13/afero v1.15.0 // indirect
330333
github.com/spf13/cast v1.10.0 // indirect
331334
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
332335
github.com/subosito/gotenv v1.6.0 // indirect
333336
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
337+
github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
338+
github.com/tetratelabs/wazero v1.11.0 // indirect
334339
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
335340
github.com/thales-e-security/pool v0.0.2 // indirect
336341
github.com/theupdateframework/go-tuf v0.7.0 // indirect
@@ -351,26 +356,26 @@ require (
351356
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
352357
github.com/xlab/treeprint v1.2.0 // indirect
353358
github.com/yuin/gopher-lua v1.1.1 // indirect
354-
gitlab.com/gitlab-org/api/client-go v0.159.0 // indirect
355-
go.mongodb.org/mongo-driver v1.17.6 // indirect
359+
gitlab.com/gitlab-org/api/client-go v1.25.0 // indirect
360+
go.mongodb.org/mongo-driver v1.17.9 // indirect
356361
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
357362
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
358363
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
359364
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
360365
go.opentelemetry.io/otel v1.40.0 // indirect
361366
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
362-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
363-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
367+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
368+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
364369
go.opentelemetry.io/otel/metric v1.40.0 // indirect
365370
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
366371
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
367372
go.opentelemetry.io/otel/trace v1.40.0 // indirect
368373
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
374+
go.uber.org/atomic v1.11.0 // indirect
369375
go.uber.org/multierr v1.11.0 // indirect
370376
go.yaml.in/yaml/v2 v2.4.3 // indirect
371377
go.yaml.in/yaml/v3 v3.0.4 // indirect
372378
golang.org/x/crypto v0.48.0 // indirect
373-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
374379
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
375380
golang.org/x/mod v0.33.0 // indirect
376381
golang.org/x/net v0.51.0 // indirect
@@ -394,6 +399,7 @@ require (
394399
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
395400
gopkg.in/warnings.v0 v0.1.2 // indirect
396401
gopkg.in/yaml.v2 v2.4.0 // indirect
402+
helm.sh/helm/v4 v4.1.1 // indirect
397403
k8s.io/cli-runtime v0.35.1 // indirect
398404
k8s.io/code-generator v0.35.2 // indirect
399405
k8s.io/component-base v0.35.2 // indirect
@@ -405,8 +411,8 @@ require (
405411
oras.land/oras-go/v2 v2.6.0 // indirect
406412
sigs.k8s.io/controller-tools v0.19.0 // indirect
407413
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
408-
sigs.k8s.io/kustomize/api v0.20.1 // indirect
409-
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
414+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
415+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
410416
sigs.k8s.io/randfill v1.0.0 // indirect
411417
sigs.k8s.io/release-utils v0.12.3 // indirect
412418
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect

0 commit comments

Comments
 (0)