From 2e7325ffbdb6ab316859ccd4aa0cf73b16cefda7 Mon Sep 17 00:00:00 2001 From: justinsb Date: Wed, 24 Jan 2024 21:15:34 -0500 Subject: [PATCH] chore: Upgrade to golang 1.21.6 Keeping up with the latest. Signed-off-by: justinsb --- .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 91b443da1..dab257ab5 100644 --- a/.github/workflows/checkLicenses.yml +++ b/.github/workflows/checkLicenses.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Go 1.21 uses: actions/setup-go@v3 with: - go-version: '>=1.21.5' + go-version: '>=1.21.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 026aad5db..b3e85151b 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.21.5' + go-version: '>=1.21.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 cb7402537..ff394d5fb 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.21.5' + go-version: '>=1.21.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 uses: actions/setup-go@v3 with: - go-version: '>=1.21.5' + go-version: '>=1.21.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 # uses: actions/setup-go@v1 # with: -# go-version: '>=1.21.5' +# go-version: '>=1.21.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 9457a05f0..d1199d438 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.21.5' + go-version: '>=1.21.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 217d9b662..c6ebe360e 100644 --- a/.github/workflows/porch-e2e.yml +++ b/.github/workflows/porch-e2e.yml @@ -58,7 +58,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.21.5' + go-version: '>=1.21.6' - name: Checkout Porch uses: actions/checkout@v3 - name: Build kpt diff --git a/.github/workflows/porch.yml b/.github/workflows/porch.yml index 2ce6e5ada..615ba9437 100644 --- a/.github/workflows/porch.yml +++ b/.github/workflows/porch.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '>=1.21.5' + go-version: '>=1.21.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 7371add98..38ec62223 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.21.5' + go-version: '>=1.21.6' - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml index 04f40c722..4d89e33e9 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.21.5' + go-version: '>=1.21.6' - uses: actions/checkout@v3 - run: | make build diff --git a/Makefile b/Makefile index c93a5edf3..1f74c6178 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.21.5 +GOLANG_VERSION := 1.21.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 1a45ed113..e67d5a69b 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.21.5-bookworm as builder +FROM golang:1.21.6-bookworm 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 b5010e950..80b7d1493 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.21.5-bookworm as builder +FROM golang:1.21.6-bookworm as builder WORKDIR /workspace ARG ETCD_VER=v3.5.1 diff --git a/porch/build/Dockerfile.porch b/porch/build/Dockerfile.porch index b06f58521..98fcc8f58 100644 --- a/porch/build/Dockerfile.porch +++ b/porch/build/Dockerfile.porch @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.21.5-bookworm as builder +FROM golang:1.21.6-bookworm as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/controllers/Dockerfile b/porch/controllers/Dockerfile index 32ca98be0..43b28d735 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.21.5-bookworm as builder +FROM golang:1.21.6-bookworm 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 1ff605745..894c29f3e 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.21.5-bookworm as builder +FROM golang:1.21.6-bookworm as builder WORKDIR /src COPY go.mod go.sum ./ diff --git a/porch/func/Dockerfile b/porch/func/Dockerfile index d4353735d..c227f7519 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.21.5-alpine3.18 as builder +FROM golang:1.21.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 7979e50e3..ef60940f2 100644 --- a/porch/func/Dockerfile-wrapperserver +++ b/porch/func/Dockerfile-wrapperserver @@ -1,4 +1,4 @@ -FROM golang:1.21.5-alpine3.18 as builder +FROM golang:1.21.6-alpine3.18 as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/test/Dockerfile b/porch/test/Dockerfile index 136b3d852..7bc47a2ea 100644 --- a/porch/test/Dockerfile +++ b/porch/test/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.21.5-bookworm as builder +FROM golang:1.21.6-bookworm as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt