Skip to content

Commit 1fa3240

Browse files
committed
Bump to Go 1.24
https://tip.golang.org/doc/go1.24 Signed-off-by: Arnaud Meukam <[email protected]>
1 parent 4539d80 commit 1fa3240

File tree

6 files changed

+61
-59
lines changed

6 files changed

+61
-59
lines changed

.golangci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 30m
3-
go: "1.23"
3+
go: "1.24"
44

55
issues:
66
max-same-issues: 0

cloudbuild.yaml

+54-54
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,64 @@
22
timeout: 1800s
33
options:
44
substitution_option: ALLOW_LOOSE
5-
machineType: 'N1_HIGHCPU_32'
5+
machineType: "E2_HIGHCPU_32"
66
steps:
7-
# Push the images
8-
- name: 'docker.io/library/golang:1.23.5-bookworm'
9-
id: images
10-
entrypoint: make
11-
env:
12-
# _GIT_TAG is not a valid semver, we use CI=1 instead
13-
# - VERSION=$_GIT_TAG
14-
- CI=$_CI
15-
- PULL_BASE_REF=$_PULL_BASE_REF
16-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
17-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
18-
args:
19-
- kops-utils-cp-push
20-
- kops-controller-push
21-
- dns-controller-push
22-
- kube-apiserver-healthcheck-push
23-
# Push the artifacts
24-
- name: 'docker.io/library/golang:1.23.5-bookworm'
25-
id: artifacts
26-
entrypoint: make
27-
env:
28-
# _GIT_TAG is not a valid semver, we use CI=1 instead
29-
# - VERSION=$_GIT_TAG
30-
- CI=$_CI
31-
- PULL_BASE_REF=$_PULL_BASE_REF
32-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
33-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
34-
- GCS_LOCATION=$_GCS_LOCATION
35-
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
36-
args:
37-
- gcs-upload-and-tag
38-
# Build cloudbuild artifacts (for attestation)
39-
- name: 'docker.io/library/golang:1.23.5-bookworm'
40-
id: cloudbuild-artifacts
41-
entrypoint: make
42-
env:
43-
# _GIT_TAG is not a valid semver, we use CI=1 instead
44-
# - VERSION=$_GIT_TAG
45-
- CI=$_CI
46-
- PULL_BASE_REF=$_PULL_BASE_REF
47-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
48-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
49-
- GCS_LOCATION=$_GCS_LOCATION
50-
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
51-
args:
52-
- cloudbuild-artifacts
7+
# Push the images
8+
- name: "mirror.gcr.io/library/golang:1.24.1-bookworm"
9+
id: images
10+
entrypoint: make
11+
env:
12+
# _GIT_TAG is not a valid semver, we use CI=1 instead
13+
# - VERSION=$_GIT_TAG
14+
- CI=$_CI
15+
- PULL_BASE_REF=$_PULL_BASE_REF
16+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
17+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
18+
args:
19+
- kops-utils-cp-push
20+
- kops-controller-push
21+
- dns-controller-push
22+
- kube-apiserver-healthcheck-push
23+
# Push the artifacts
24+
- name: "mirror.gcr.io/library/golang:1.24.1-bookworm"
25+
id: artifacts
26+
entrypoint: make
27+
env:
28+
# _GIT_TAG is not a valid semver, we use CI=1 instead
29+
# - VERSION=$_GIT_TAG
30+
- CI=$_CI
31+
- PULL_BASE_REF=$_PULL_BASE_REF
32+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
33+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
34+
- GCS_LOCATION=$_GCS_LOCATION
35+
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
36+
args:
37+
- gcs-upload-and-tag
38+
# Build cloudbuild artifacts (for attestation)
39+
- name: "mirror.gcr.io/library/golang:1.24.1-bookworm"
40+
id: cloudbuild-artifacts
41+
entrypoint: make
42+
env:
43+
# _GIT_TAG is not a valid semver, we use CI=1 instead
44+
# - VERSION=$_GIT_TAG
45+
- CI=$_CI
46+
- PULL_BASE_REF=$_PULL_BASE_REF
47+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
48+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
49+
- GCS_LOCATION=$_GCS_LOCATION
50+
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
51+
args:
52+
- cloudbuild-artifacts
5353
substitutions:
5454
# _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
5555
# can be used as a substitution
56-
_CI: '1'
57-
_GIT_TAG: '12345'
58-
_PULL_BASE_REF: 'dev'
59-
_DOCKER_REGISTRY: 'gcr.io'
60-
_DOCKER_IMAGE_PREFIX: 'k8s-staging-kops/'
61-
_GCS_LOCATION: 'gs://k8s-staging-kops/kops/releases/'
56+
_CI: "1"
57+
_GIT_TAG: "12345"
58+
_PULL_BASE_REF: "dev"
59+
_DOCKER_REGISTRY: "gcr.io"
60+
_DOCKER_IMAGE_PREFIX: "k8s-staging-kops/"
61+
_GCS_LOCATION: "gs://k8s-staging-kops/kops/releases/"
6262
artifacts:
6363
objects:
64-
location: '$_GCS_LOCATION/$_GIT_TAG/cloudbuild/'
64+
location: "$_GCS_LOCATION/$_GIT_TAG/cloudbuild/"
6565
paths: ["cloudbuild/*"]

go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
module k8s.io/kops
22

33
// This should be kept in sync with cloudbuild.yaml and the other go.mod files
4-
go 1.23.5
4+
go 1.24.1
5+
6+
godebug default=go1.24
57

68
require (
79
cloud.google.com/go/compute/metadata v0.5.2

hack/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/hack
22

3-
go 1.23.5
3+
go 1.24.1
44

55
require (
66
github.com/client9/misspell v0.3.4

tests/e2e/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/tests/e2e
22

3-
go 1.23.5
3+
go 1.24.1
44

55
replace k8s.io/kops => ../../.
66

tools/otel/traceserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/kops/tools/otel/traceserver
22

3-
go 1.23.5
3+
go 1.24.1
44

55
require (
66
go.opentelemetry.io/proto/otlp v1.3.1

0 commit comments

Comments
 (0)