Merge pull request #4114 from justinsb/golang_1_21_6

chore: Upgrade to golang 1.21.6

.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

.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

.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

.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

.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

.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

.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:

.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

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)
 

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

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

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
 

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 ./

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 ./

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/[email protected]

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
 

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