Skip to content

Commit 309ac0c

Browse files
authored
Merge pull request #4529 from mboersma/go-one-twenty-one
Update Go to v1.21
2 parents d0f78e0 + ff7916f commit 309ac0c

File tree

13 files changed

+86
-14
lines changed

13 files changed

+86
-14
lines changed

.github/workflows/cover.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
2222
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2323
with:
24-
go-version: '1.20'
24+
go-version: '1.21'
2525
- run: "PATH=/usr/local/go/bin:$PATH make test-cover"
2626
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
2727
env:

.github/workflows/dependabot-code-gen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Go 1.x
2727
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2828
with:
29-
go-version: '1.20'
29+
go-version: '1.21'
3030
id: go
3131
- name: Check out code into the Go module directory
3232
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2

.github/workflows/scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
- name: Setup go
2323
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2424
with:
25-
go-version: 1.20
25+
go-version: 1.21
2626
- name: Run verify container script
2727
run: make verify-container-images

.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ linters-settings:
124124
arguments:
125125
- disableStutteringCheck
126126
staticcheck:
127-
go: "1.20"
127+
go: "1.21"
128128
stylecheck:
129-
go: "1.20"
129+
go: "1.21"
130130
unused:
131-
go: "1.20"
131+
go: "1.21"
132132

133133
issues:
134134
exclude-rules:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ARG ARCH
1919

2020
# Build the manager binary
21-
FROM golang:1.20 as builder
21+
FROM golang:1.21 as builder
2222
WORKDIR /workspace
2323

2424
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ delete-workload-cluster: $(KUBECTL) ## Deletes the example workload Kubernetes c
375375
.PHONY: docker-pull-prerequisites
376376
docker-pull-prerequisites: ## Pull prerequisites for building controller-manager.
377377
docker pull docker/dockerfile:1.4
378-
docker pull docker.io/library/golang:1.20
378+
docker pull docker.io/library/golang:1.21
379379
docker pull gcr.io/distroless/static:latest
380380

381381
.PHONY: docker-build
@@ -629,7 +629,7 @@ release-binary: $(RELEASE_DIR) ## Compile and build release binaries.
629629
-e GOARCH=$(GOARCH) \
630630
-v "$$(pwd):/workspace" \
631631
-w /workspace \
632-
golang:1.20 \
632+
golang:1.21 \
633633
go build -a -ldflags '$(LDFLAGS) -extldflags "-static"' \
634634
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)
635635

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def validate_auth():
113113

114114
tilt_helper_dockerfile_header = """
115115
# Tilt image
116-
FROM golang:1.20 as tilt-helper
116+
FROM golang:1.21 as tilt-helper
117117
# Support live reloading with Tilt
118118
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
119119
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \

docs/book/src/developers/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
### Base requirements
4747

4848
1. Install [go][go]
49-
- Get the latest patch version for go v1.20.
49+
- Get the latest patch version for go v1.21.
5050
2. Install [jq][jq]
5151
- `brew install jq` on macOS.
5252
- `sudo apt install jq` on Windows + WSL2

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-azure
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0

go.sum

Lines changed: 57 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)