From 1d13188d2497f684d52d3d3c1a809c9de9863f0c Mon Sep 17 00:00:00 2001 From: Louis Jimenez Date: Fri, 28 Jun 2024 14:44:34 -0400 Subject: [PATCH] Update golang to 1.22.4 (#4164) * Update golang to 1.22.4 Signed-off-by: Louis Jimenez * Replace busybox with no-op function in test Signed-off-by: Fredrik Sommar --------- Signed-off-by: Louis Jimenez Signed-off-by: Fredrik Sommar Co-authored-by: Fredrik Sommar --- .github/workflows/checkLicenses.yml | 4 ++-- .github/workflows/e2eEnvironment.yml | 2 +- .github/workflows/go.yml | 6 +++--- .github/workflows/live-e2e.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verifyContent.yml | 2 +- Makefile | 2 +- internal/fnruntime/container_test.go | 5 +++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/checkLicenses.yml b/.github/workflows/checkLicenses.yml index 1348eb80bb..11e6a4e5f0 100644 --- a/.github/workflows/checkLicenses.yml +++ b/.github/workflows/checkLicenses.yml @@ -21,10 +21,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up Go 1.21 + - name: Set up Go 1.22 uses: actions/setup-go@v3 with: - go-version: '>=1.21.10' + go-version: '>=1.22.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 162540ac91..f3bf04793d 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.10' + go-version: '>=1.22.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 567a053287..20b94cd588 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.10' + go-version: '>=1.22.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.10' + go-version: '>=1.22.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.10' +# go-version: '>=1.22.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 2b57333566..3546e4bc34 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.10' + go-version: '>=1.22.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/release.yml b/.github/workflows/release.yml index d07897753f..c4618da3af 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.10' + go-version: '>=1.22.4' - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/verifyContent.yml b/.github/workflows/verifyContent.yml index 5031fc38b0..9cb7d13a5a 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.10' + go-version: '>=1.22.4' - uses: actions/checkout@v3 - run: | make build diff --git a/Makefile b/Makefile index 8084a08e58..135b464218 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.10 +GOLANG_VERSION := 1.22.4 GORELEASER_CONFIG = release/tag/goreleaser.yaml GORELEASER_IMAGE := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION) diff --git a/internal/fnruntime/container_test.go b/internal/fnruntime/container_test.go index 9333e02d36..8e85670906 100644 --- a/internal/fnruntime/container_test.go +++ b/internal/fnruntime/container_test.go @@ -36,8 +36,9 @@ func TestContainerFn(t *testing.T) { err bool }{ { - name: "simple busybox", - image: "gcr.io/google-containers/busybox", + name: "no-op function", + image: "gcr.io/kpt-functions/no-op", + output: "apiVersion: v1\nkind: ResourceList\nmetadata:\n name: output\nitems: []\n", }, { name: "non-existing image",