From bf193f3b19b3067500b2336146fee8381b1c817a Mon Sep 17 00:00:00 2001 From: Morten Torkildsen Date: Fri, 28 Jul 2023 22:20:52 +0000 Subject: [PATCH] Update to golang 1.20.6 --- .github/workflows/checkLicenses.yml | 2 +- .github/workflows/e2eEnvironment.yml | 2 +- .github/workflows/go.yml | 6 +++--- .github/workflows/live-e2e.yml | 2 +- .github/workflows/porch-e2e.yml | 2 +- .github/workflows/porch.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verifyContent.yml | 2 +- Makefile | 2 +- porch/build/Dockerfile.apiserver | 2 +- porch/build/Dockerfile.etcd | 2 +- porch/build/Dockerfile.porch | 2 +- porch/controllers/Dockerfile | 2 +- porch/examples/apps/hello-server/Dockerfile | 2 +- porch/func/Dockerfile | 2 +- porch/func/Dockerfile-wrapperserver | 2 +- porch/test/Dockerfile | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml index 8605eec1e..13ae6fc1b 100644 --- a/.github/workflows/checkLicenses.yml +++ b/.github/workflows/checkLicenses.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - run: | ./scripts/create-licenses.sh # Upload the licenses list so it's available if needed diff --git a/.github/workflows/e2eEnvironment.yml b/.github/workflows/e2eEnvironment.yml index 606da882b..8d1cbf71b 100644 --- a/.github/workflows/e2eEnvironment.yml +++ b/.github/workflows/e2eEnvironment.yml @@ -34,7 +34,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - uses: actions/checkout@v3 # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions # If you upgrade this version confirm the changes match your expectations diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index eca028ebd..ab6781ef2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' id: go - name: Check out code into the Go module directory uses: actions/checkout@v3 @@ -70,7 +70,7 @@ jobs: - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' id: go - name: Check out code into the Go module directory uses: actions/checkout@v3 @@ -88,7 +88,7 @@ jobs: # - name: Set up Go 1.20 # uses: actions/setup-go@v1 # with: -# go-version: '>=1.20.5' +# go-version: '>=1.20.6' # id: go # - name: Check out code into the Go module directory # uses: actions/checkout@v3 diff --git a/.github/workflows/live-e2e.yml b/.github/workflows/live-e2e.yml index 36e69f55f..f2cf2994d 100644 --- a/.github/workflows/live-e2e.yml +++ b/.github/workflows/live-e2e.yml @@ -33,7 +33,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - uses: actions/checkout@master # Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions # If you upgrade this version confirm the changes match your expectations diff --git a/.github/workflows/porch-e2e.yml b/.github/workflows/porch-e2e.yml index 99606efb3..554dee6e0 100644 --- a/.github/workflows/porch-e2e.yml +++ b/.github/workflows/porch-e2e.yml @@ -56,7 +56,7 @@ jobs: - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - name: Checkout Porch uses: actions/checkout@v3 - name: Build kpt diff --git a/.github/workflows/porch.yml b/.github/workflows/porch.yml index a4a4f0a3d..18fdf89ea 100644 --- a/.github/workflows/porch.yml +++ b/.github/workflows/porch.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Go 1.20 uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - name: Run Porch Unit Tests uses: actions/checkout@v3 - name: Verify format / headers etc diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd8c20ab2..c919b770f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml index d05228ab6..ea7e8d39e 100644 --- a/.github/workflows/verifyContent.yml +++ b/.github/workflows/verifyContent.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: '>=1.20.5' + go-version: '>=1.20.6' - uses: actions/checkout@v3 - run: | make build diff --git a/Makefile b/Makefile index d7a2a663d..45b457a04 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -GOLANG_VERSION := 1.20.5 +GOLANG_VERSION := 1.20.6 GORELEASER_CONFIG = release/tag/goreleaser.yaml GORELEASER_IMAGE := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION) diff --git a/porch/build/Dockerfile.apiserver b/porch/build/Dockerfile.apiserver index 8049dc1a3..4b4bb2d01 100644 --- a/porch/build/Dockerfile.apiserver +++ b/porch/build/Dockerfile.apiserver @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /workspace/src RUN git clone https://github.com/kubernetes/kubernetes --branch v1.23.2 --depth=1 diff --git a/porch/build/Dockerfile.etcd b/porch/build/Dockerfile.etcd index 342706041..abbd86d7e 100644 --- a/porch/build/Dockerfile.etcd +++ b/porch/build/Dockerfile.etcd @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /workspace ARG ETCD_VER=v3.5.1 diff --git a/porch/build/Dockerfile.porch b/porch/build/Dockerfile.porch index 1f7bb7a7e..a5e2d99b6 100644 --- a/porch/build/Dockerfile.porch +++ b/porch/build/Dockerfile.porch @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.20.5-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/controllers/Dockerfile b/porch/controllers/Dockerfile index b9eb85513..e10b9e570 100644 --- a/porch/controllers/Dockerfile +++ b/porch/controllers/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /workspace COPY go.mod go.sum ./ diff --git a/porch/examples/apps/hello-server/Dockerfile b/porch/examples/apps/hello-server/Dockerfile index cec978f11..016513e49 100644 --- a/porch/examples/apps/hello-server/Dockerfile +++ b/porch/examples/apps/hello-server/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /src COPY go.mod go.sum ./ diff --git a/porch/func/Dockerfile b/porch/func/Dockerfile index 24dd3b5ae..50c99fc2c 100644 --- a/porch/func/Dockerfile +++ b/porch/func/Dockerfile @@ -25,7 +25,7 @@ FROM gcr.io/kpt-fn/set-project-id:v0.2.0 as set-project-id FROM gcr.io/kpt-fn/starlark:v0.3.0 as starlark FROM gcr.io/kpt-fn/upsert-resource:v0.2.0 as upsert-resource -FROM golang:1.20.5-alpine3.18 as builder +FROM golang:1.20.6-alpine3.18 as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt RUN go install github.com/grpc-ecosystem/grpc-health-probe@v0.4.11 diff --git a/porch/func/Dockerfile-wrapperserver b/porch/func/Dockerfile-wrapperserver index 3e8495dea..a6c38cdcd 100644 --- a/porch/func/Dockerfile-wrapperserver +++ b/porch/func/Dockerfile-wrapperserver @@ -1,4 +1,4 @@ -FROM golang:1.20.5-alpine3.18 as builder +FROM golang:1.20.6-alpine3.18 as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/test/Dockerfile b/porch/test/Dockerfile index bebc44f99..2e3e5cdb5 100644 --- a/porch/test/Dockerfile +++ b/porch/test/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.20.5-bullseye as builder +FROM golang:1.20.6-bullseye as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt