Skip to content

Commit 817b201

Browse files
committed
etcd: run govulncheck using Go 1.23
Keep the Go version in sync with the Go version used by the stable releases. Once the stable branches use Go 1.24, we can use the tool directive and the installed tools should use the same toolchain version from the go.mod. Therefore, we can go back to use the kubekins image, and consolidate the jobs.
1 parent bf8403c commit 817b201

File tree

1 file changed

+34
-3
lines changed

1 file changed

+34
-3
lines changed

config/jobs/etcd/etcd-presubmits.yaml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,51 @@ presubmits:
157157
cpu: "4"
158158
memory: "4Gi"
159159

160-
- name: pull-etcd-govulncheck
160+
- name: pull-etcd-govulncheck-main
161161
cluster: eks-prow-build-cluster
162162
always_run: true
163163
branches:
164164
- main
165+
decorate: true
166+
annotations:
167+
testgrid-dashboards: sig-etcd-presubmits
168+
testgrid-tab-name: pull-etcd-govulncheck-main
169+
spec:
170+
containers:
171+
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250613-876fb90a97-master
172+
command:
173+
- runner.sh
174+
args:
175+
- bash
176+
- -c
177+
- |
178+
export PATH=$GOPATH/bin:$PATH && make run-govulncheck
179+
resources:
180+
requests:
181+
cpu: "4"
182+
memory: "4Gi"
183+
limits:
184+
cpu: "4"
185+
memory: "4Gi"
186+
187+
- name: pull-etcd-govulncheck-release-branches
188+
cluster: eks-prow-build-cluster
189+
always_run: true
190+
branches:
165191
- release-3.6
166192
- release-3.4
167193
decorate: true
168194
annotations:
169195
testgrid-dashboards: sig-etcd-presubmits
170-
testgrid-tab-name: pull-etcd-govulncheck
196+
testgrid-tab-name: pull-etcd-govulncheck-release-branches
171197
spec:
172198
containers:
173-
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250613-876fb90a97-master
199+
# Keep it in sync with the Go version used by the stable releases.
200+
# Once the stable branches use Go 1.24, we can use the tool directive
201+
# and the installed tools should use the same toolchain version from the
202+
# go.mod. Therefore, we can go back to use the kubekins image, and
203+
# consolidate the jobs.
204+
- image: public.ecr.aws/docker/library/golang:1.23
174205
command:
175206
- runner.sh
176207
args:

0 commit comments

Comments
 (0)