From 18e00874395470ece85b833dedf7b1e2bf00520c Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Thu, 15 Aug 2024 14:10:21 +0300 Subject: [PATCH 1/2] Build with Go 1.23 Signed-off-by: Stefan Prodan --- .github/workflows/e2e-azure.yaml | 2 +- .github/workflows/e2e-bootstrap.yaml | 2 +- .github/workflows/e2e-gcp.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-azure.yaml b/.github/workflows/e2e-azure.yaml index 0703f03afc..5dfecec845 100644 --- a/.github/workflows/e2e-azure.yaml +++ b/.github/workflows/e2e-azure.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: tests/integration/go.sum - name: Setup Flux CLI run: make build diff --git a/.github/workflows/e2e-bootstrap.yaml b/.github/workflows/e2e-bootstrap.yaml index b179d0b419..d8bed3e3b2 100644 --- a/.github/workflows/e2e-bootstrap.yaml +++ b/.github/workflows/e2e-bootstrap.yaml @@ -21,7 +21,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: | **/go.sum **/go.mod diff --git a/.github/workflows/e2e-gcp.yaml b/.github/workflows/e2e-gcp.yaml index da18d4f001..75a17a0f2e 100644 --- a/.github/workflows/e2e-gcp.yaml +++ b/.github/workflows/e2e-gcp.yaml @@ -33,7 +33,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: tests/integration/go.sum - name: Setup Flux CLI run: make build diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 41aa6ebdff..864e144b4b 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -27,7 +27,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: | **/go.sum **/go.mod diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 211a4339d2..9af1055a8c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,7 +26,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache: false - name: Setup QEMU uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 311f3dd076..2de27e1134 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: | **/go.sum **/go.mod From c39af08b47048acb156dde97440cd74756a7f362 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Thu, 15 Aug 2024 14:10:52 +0300 Subject: [PATCH 2/2] Update alpine to 3.20 for flux-cli Signed-off-by: Stefan Prodan --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c918f4b064..3cdcc3f45f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.19 as builder +FROM alpine:3.20 as builder RUN apk add --no-cache ca-certificates curl ARG ARCH=linux/amd64 -ARG KUBECTL_VER=1.30.0 +ARG KUBECTL_VER=1.31.0 RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/${ARCH}/kubectl \ -o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl && \ kubectl version --client=true -FROM alpine:3.19 as flux-cli +FROM alpine:3.20 as flux-cli RUN apk add --no-cache ca-certificates