Skip to content

Commit aa4d6cb

Browse files
authored
Merge pull request #4393 from Ankitasw/bump-golang
Bump golang to v1.20.5 and kpromo to v4.0.4
2 parents c0796ce + 9047e9b commit aa4d6cb

File tree

16 files changed

+348
-1121
lines changed

16 files changed

+348
-1121
lines changed

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go 1.x
2222
uses: actions/setup-go@v4
2323
with:
24-
go-version: '1.19'
24+
go-version: '1.20'
2525
id: go
2626
- name: Check out code into the Go module directory
2727
uses: actions/[email protected]

.github/workflows/scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
- name: Setup go
1919
uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.19
21+
go-version: 1.20
2222
- name: Run verify container script
2323
run: make verify-container-images

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ linters-settings:
162162
- pkg: "sigs.k8s.io/cluster-api/exp/api/v1beta1"
163163
alias: expclusterv1
164164
staticcheck:
165-
go: "1.19"
165+
go: "1.20"
166166
stylecheck:
167-
go: "1.19"
167+
go: "1.20"
168168
issues:
169169
max-same-issues: 0
170170
max-issues-per-linter: 0

docs/triage-party/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717

18-
FROM golang:1.19.4 as builder
18+
FROM golang:1.20.5 as builder
1919

2020
RUN go get github.com/google/triage-party/cmd/server
2121
RUN go install github.com/google/triage-party/cmd/server@latest

docs/triage-party/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module triage-party-deployment
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/aws/aws-cdk-go/awscdk v1.110.0-devpreview

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-aws/v2
22

3-
go 1.19
3+
go 1.20
44

55
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.4
66

hack/ensure-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EOF
3131
local go_version
3232
IFS=" " read -ra go_version <<< "$(go version)"
3333
local minimum_go_version
34-
minimum_go_version=go1.19.0
34+
minimum_go_version=go1.20.0
3535
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
3636
cat <<EOF
3737
Detected go version: ${go_version[*]}.

hack/tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ $(PLANTUML): plantuml.Dockerfile ../../versions.mk
154154
KPROMO_BIN := kpromo
155155
KPROMO := $(BIN_DIR)/$(KPROMO_BIN)
156156
$(KPROMO):
157-
CGO_ENABLED=0 go build -o $@ sigs.k8s.io/promo-tools/v3/cmd/kpromo
157+
CGO_ENABLED=0 go build -o $@ sigs.k8s.io/promo-tools/v4/cmd/kpromo
158158

159159
YQ_BIN := yq
160160
YQ := $(BIN_DIR)/$(YQ_BIN)

hack/tools/go.mod

Lines changed: 97 additions & 139 deletions
Large diffs are not rendered by default.

hack/tools/go.sum

Lines changed: 236 additions & 967 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)