From 12ce1f50c2b60ad0de8621d7a551987531787023 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Fri, 27 Oct 2023 12:06:26 -0400 Subject: [PATCH 1/3] Bump go to 1.20 Update golang to 1.20.x in our CI build and go.mod. --- .github/workflows/ci.yml | 6 +++--- go.mod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efb5b57f..f4934e54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.19.x + go-version: 1.20.x cache: true check-latest: true - name: Build @@ -33,7 +33,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.19.x + go-version: 1.20.x cache: true check-latest: true - name: Verify fmt @@ -62,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.19.x + go-version: 1.20.x cache: true check-latest: true - name: Install kubectl diff --git a/go.mod b/go.mod index cbdce2d6..d53069d6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/shipwright-io/operator -go 1.19 +go 1.20 require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d From 1efb8e170acf5094bd8a638d68220e4258045c80 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Fri, 27 Oct 2023 12:11:35 -0400 Subject: [PATCH 2/3] Update ko to v0.15.0 Update ko to the latest release. This adds support for golang 1.20 and 1.21, plus brings in additional new features related to software supply chain. --- Makefile | 2 +- hack/install-ko.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1a5e6c4c..e5229890 100644 --- a/Makefile +++ b/Makefile @@ -326,7 +326,7 @@ KO ?= $(LOCALBIN)/ko ## Tool Versions -KO_VERSION ?= v0.11.2 +KO_VERSION ?= v0.15.0 .PHONY: ko ko: $(KO) ## Download ko locally if necessary diff --git a/hack/install-ko.sh b/hack/install-ko.sh index 599d7298..36ac4a46 100755 --- a/hack/install-ko.sh +++ b/hack/install-ko.sh @@ -8,7 +8,7 @@ set -e DEST="${1:-bin/ko}" -KO_VERSION="${KO_VERSION:-0.11.2}" +KO_VERSION="${KO_VERSION:-0.15.0}" OS="${OS:-linux}" ARCH="${ARCH:-amd64}" From 024eac11c9ddec064408107c87dc5916fffd5188 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Fri, 27 Oct 2023 13:43:49 -0400 Subject: [PATCH 3/3] Update go version in docs - Update go version references in development docs to v1.20 or higher - Fix link to ko docs, now that they have an offical docs site. --- docs/development/local-development.md | 4 ++-- docs/development/olm-development.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/development/local-development.md b/docs/development/local-development.md index 405568c2..022bd755 100644 --- a/docs/development/local-development.md +++ b/docs/development/local-development.md @@ -3,7 +3,7 @@ ## Prerequisites * Ensure you have access to a Kubernetes cluster via `kubectl` with cluster admin permissions. -* Install Go version 1.18 or higher. +* Install [Go](https://go.dev/doc/install) version 1.20 or higher. ## Building locally @@ -28,7 +28,7 @@ The following make options can be set: * `VERSION` - defaults to the current version of Shipwright. This must be a valid [semantic version](https://semver.org/), and will be used as the tag for the resulting image. -Refer to the [ko documentation](https://github.com/google/ko#local-publishing-options) for more information. +Refer to the [ko documentation](https://ko.build/) for more information. ## Deploy to Kubernetes diff --git a/docs/development/olm-development.md b/docs/development/olm-development.md index 6daa0578..0177746d 100644 --- a/docs/development/olm-development.md +++ b/docs/development/olm-development.md @@ -9,7 +9,7 @@ Additional steps need to be taken to ensure the operator can be deployed with OL ## Prerequisites * Ensure you have access to a Kubernetes cluster via `kubectl` with cluster admin permissions. -* Install Go version 1.17 or higher. +* Install [Go](https://go.dev/doc/install) version 1.20 or higher. * Install OLM on your cluster. This can be done using the `make install-olm` command. * Ability to push to a container registry that is accessible inside your Kubernetes cluster.