diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml index 5a975495d..a7e240053 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.3' + go-version: '>=1.21.4' - 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 0f6ae170c..848f60278 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.3' + go-version: '>=1.21.4' - 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 7fe500996..a1f35feb6 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.3' + go-version: '>=1.21.4' 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.3' + go-version: '>=1.21.4' 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.3' +# go-version: '>=1.21.4' # 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 a0c910a9b..28fad4b12 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.3' + go-version: '>=1.21.4' - 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 28ef88d46..de083c691 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.3' + go-version: '>=1.21.4' - name: Checkout Porch uses: actions/checkout@v3 - name: Build kpt diff --git a/.github/workflows/porch.yml b/.github/workflows/porch.yml index f63456bb6..0179faa1c 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.3' + go-version: '>=1.21.4' - 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 c5cefd651..84b6067d5 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.3' + go-version: '>=1.21.4' - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml index bc6964c3f..2a0355469 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.3' + go-version: '>=1.21.4' - uses: actions/checkout@v3 - run: | make build diff --git a/Makefile b/Makefile index 4d6f8d3cf..fbefa90c2 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.3 +GOLANG_VERSION := 1.21.4 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 15d2171a4..6523064cc 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.3-bookworm as builder +FROM golang:1.21.4-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 75f07615a..815136e9e 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.3-bookworm as builder +FROM golang:1.21.4-bookworm as builder WORKDIR /workspace ARG ETCD_VER=v3.5.1 diff --git a/porch/build/Dockerfile.porch b/porch/build/Dockerfile.porch index b9a7b93e9..2e25d522f 100644 --- a/porch/build/Dockerfile.porch +++ b/porch/build/Dockerfile.porch @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.21.3-bookworm as builder +FROM golang:1.21.4-bookworm as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/controllers/Dockerfile b/porch/controllers/Dockerfile index 4167aa90a..c3795f1f2 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.3-bookworm as builder +FROM golang:1.21.4-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 37ff9d97e..6aad2a199 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.3-bookworm as builder +FROM golang:1.21.4-bookworm as builder WORKDIR /src COPY go.mod go.sum ./ diff --git a/porch/func/Dockerfile b/porch/func/Dockerfile index d593d277a..482b71a43 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.3-alpine3.18 as builder +FROM golang:1.21.4-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 e12332b36..05608df20 100644 --- a/porch/func/Dockerfile-wrapperserver +++ b/porch/func/Dockerfile-wrapperserver @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine3.18 as builder +FROM golang:1.21.4-alpine3.18 as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt diff --git a/porch/test/Dockerfile b/porch/test/Dockerfile index 482629dd1..f449571d6 100644 --- a/porch/test/Dockerfile +++ b/porch/test/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM golang:1.21.3-bookworm as builder +FROM golang:1.21.4-bookworm as builder WORKDIR /go/src/github.com/GoogleContainerTools/kpt