Repository: GoogleContainerTools/kpt
Pull request #3996 (2023-07-05 19:50:38)

Update to Golang 1.20.5
Upgrade due to some security issues in Golang 1.20.4



Patch:
diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml
index 374e040c..8605eec1 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.4'
+          go-version: '>=1.20.5'
       - run: |
           ./scripts/create-licenses.sh
       # Upload the licenses list so it's available if needed
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index f53b89f9..eca028eb 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.4'
+          go-version: '>=1.20.5'
         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.4'
+          go-version: '>=1.20.5'
         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.4'
+#          go-version: '>=1.20.5'
 #        id: go
 #      - name: Check out code into the Go module directory
 #        uses: actions/checkout@v3
diff --git a/.github/workflows/porch.yml b/.github/workflows/porch.yml
index 14fcbf52..a4a4f0a3 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.4'
+          go-version: '>=1.20.5'
       - 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 ec45878d..dd8c20ab 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.4'
+          go-version: '>=1.20.5'
       - name: Checkout
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml
index da675cd6..d05228ab 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.4'
+          go-version: '>=1.20.5'
       - uses: actions/checkout@v3
       - run: |
           make build
diff --git a/Makefile b/Makefile
index f029f3c4..d7a2a663 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.4
+GOLANG_VERSION         := 1.20.5
 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 704ec065..8049dc1a 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-bullseye as builder
+FROM golang:1.20.5-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 12185fad..34270604 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-bullseye as builder
+FROM golang:1.20.5-bullseye as builder
 
 WORKDIR /workspace
 ARG ETCD_VER=v3.5.1
diff --git a/porch/build/Dockerfile.porch b/porch/build/Dockerfile.porch
index 97bfec34..1f7bb7a7 100644
--- a/porch/build/Dockerfile.porch
+++ b/porch/build/Dockerfile.porch
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM golang:1.20-bullseye as builder
+FROM golang:1.20.5-bullseye as builder
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kpt
 
diff --git a/porch/examples/apps/hello-server/Dockerfile b/porch/examples/apps/hello-server/Dockerfile
index 644b255d..cec978f1 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-bullseye as builder
+FROM golang:1.20.5-bullseye as builder
 
 WORKDIR /src
 COPY go.mod go.sum ./
diff --git a/porch/func/Dockerfile b/porch/func/Dockerfile
index f4efe3ba..24dd3b5a 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.3-alpine3.17 as builder
+FROM golang:1.20.5-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 083d65ea..3e8495de 100644
--- a/porch/func/Dockerfile-wrapperserver
+++ b/porch/func/Dockerfile-wrapperserver
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine3.17 as builder
+FROM golang:1.20.5-alpine3.18 as builder
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kpt
 


Test patch:
diff --git a/.github/workflows/e2eEnvironment.yml b/.github/workflows/e2eEnvironment.yml
index 71df7cdb..606da882 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.4'
+          go-version: '>=1.20.5'
       - 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/live-e2e.yml b/.github/workflows/live-e2e.yml
index f97e6242..36e69f55 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.4'
+          go-version: '>=1.20.5'
       - 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 10d0d2ef..99606efb 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.4'
+          go-version: '>=1.20.5'
       - name: Checkout Porch
         uses: actions/checkout@v3
       - name: Build kpt
diff --git a/porch/test/Dockerfile b/porch/test/Dockerfile
index e1536b8a..bebc44f9 100644
--- a/porch/test/Dockerfile
+++ b/porch/test/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM golang:1.20-bullseye as builder
+FROM golang:1.20.5-bullseye as builder
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kpt