Skip to content

Commit cf1e9b7

Browse files
authored
Merge pull request #6616 from palnabarun/remaining-go-bumps
✨ Bump Go to 1.18.3 for Tiltfile, Container Images, Netlify
2 parents 0bf6351 + c1d6d69 commit cf1e9b7

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go 1.x
1818
uses: actions/setup-go@v3
1919
with:
20-
go-version: '1.17'
20+
go-version: '1.18'
2121
id: go
2222
- name: Check out code into the Go module directory
2323
uses: actions/checkout@v3

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install go
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: '^1.17'
23+
go-version: '^1.18'
2424
- name: generate release artifacts
2525
run: |
2626
make release

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.17.3
26+
GO_VERSION ?= 1.18.3
2727
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2828

2929
# Use GOPROXY environment variable if set

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def load_provider_tiltfiles():
144144

145145
tilt_helper_dockerfile_header = """
146146
# Tilt image
147-
FROM golang:1.17.3 as tilt-helper
147+
FROM golang:1.18.3 as tilt-helper
148148
# Support live reloading with Tilt
149149
RUN go get github.com/go-delve/delve/cmd/dlv
150150
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \

docs/book/src/developer/providers/v1.1-to-v1.2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ maintainers of providers and consumers of our Go API.
99

1010
## Minimum Go version
1111

12-
* The Go version used by Cluster API is now Go 1.17.x
12+
* The Go version used by Cluster API is now Go 1.18.x
1313

1414
## Dependencies
1515

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.16.0
34+
minimum_go_version=go1.18.3
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[*]}.

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
publish = "docs/book/book"
55

66
[build.environment]
7-
GO_VERSION = "1.17"
7+
GO_VERSION = "1.18"
88

99
# Standard Netlify redirects
1010
[[redirects]]

test/infrastructure/docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ROOT = ../../..
1919

2020
.DEFAULT_GOAL:=help
2121

22-
GO_VERSION ?= 1.17.3
22+
GO_VERSION ?= 1.18.3
2323
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2424

2525
# Use GOPROXY environment variable if set

0 commit comments

Comments
 (0)