Skip to content

Commit 896aff9

Browse files
authored
Merge pull request #7135 from oscr/upgrade-golang-1.19
🌱 Upgrade golang version (1.18.3 -> 1.19.0)
2 parents fbbea76 + 2fb25ef commit 896aff9

File tree

11 files changed

+17
-15
lines changed

11 files changed

+17
-15
lines changed

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go 1.x
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: '1.18'
23+
go-version: '1.19'
2424
id: go
2525
- name: Check out code into the Go module directory
2626
uses: actions/checkout@v3

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v3
2222
- uses: actions/setup-go@v3
2323
with:
24-
go-version: 1.18
24+
go-version: 1.19
2525
- name: golangci-lint
2626
uses: golangci/[email protected]
2727
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install go
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: '^1.18'
26+
go-version: '^1.19'
2727
- name: generate release artifacts
2828
run: |
2929
make release

.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ linters-settings:
135135
allow-leading-space: false
136136
require-specific: true
137137
staticcheck:
138-
go: "1.18"
138+
go: "1.19"
139139
stylecheck:
140-
go: "1.18"
140+
go: "1.19"
141141
gosec:
142142
excludes:
143143
- G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -160,7 +160,7 @@ linters-settings:
160160
- whyNoLint
161161
- wrapperFunc
162162
unused:
163-
go: "1.18"
163+
go: "1.19"
164164
issues:
165165
max-same-issues: 0
166166
max-issues-per-linter: 0

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.18.3
26+
GO_VERSION ?= 1.19.0
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
@@ -189,7 +189,7 @@ def load_addon_tiltfiles():
189189

190190
tilt_helper_dockerfile_header = """
191191
# Tilt image
192-
FROM golang:1.18.3 as tilt-helper
192+
FROM golang:1.19.0 as tilt-helper
193193
# Support live reloading with Tilt
194194
RUN go install github.com/go-delve/delve/cmd/dlv@latest
195195
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \

cloudbuild-nightly.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# See https://cloud.google.com/cloud-build/docs/build-config
2+
# See https://console.cloud.google.com/gcr/images/k8s-staging-test-infra/global/gcb-docker-gcloud
23
timeout: 2700s
34
options:
45
substitution_option: ALLOW_LOOSE
56
machineType: 'N1_HIGHCPU_8'
67
steps:
7-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220830-45cbff55bc'
89
entrypoint: make
910
env:
1011
- DOCKER_CLI_EXPERIMENTAL=enabled
@@ -13,7 +14,7 @@ steps:
1314
- DOCKER_BUILDKIT=1
1415
args:
1516
- release-staging-nightly
16-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
17+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220830-45cbff55bc'
1718
entrypoint: make
1819
env:
1920
- DOCKER_CLI_EXPERIMENTAL=enabled

cloudbuild.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# See https://cloud.google.com/cloud-build/docs/build-config
2+
# See https://console.cloud.google.com/gcr/images/k8s-staging-test-infra/global/gcb-docker-gcloud
23
timeout: 2700s
34
options:
45
substitution_option: ALLOW_LOOSE
56
machineType: 'N1_HIGHCPU_8'
67
steps:
7-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220830-45cbff55bc'
89
entrypoint: make
910
env:
1011
- DOCKER_CLI_EXPERIMENTAL=enabled
@@ -13,7 +14,7 @@ steps:
1314
- DOCKER_BUILDKIT=1
1415
args:
1516
- release-staging
16-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
17+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220830-45cbff55bc'
1718
entrypoint: make
1819
env:
1920
- DOCKER_CLI_EXPERIMENTAL=enabled

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

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

66
## Minimum Go version
77

8-
* The Go version used by Cluster API is still Go 1.18.x
8+
* The Go version used by Cluster API is Go 1.19.x
99

1010
## Dependencies
1111

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

0 commit comments

Comments
 (0)