diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml index e1a6fd0d..e45f45fe 100644 --- a/.github/workflows/e2e-arm64.yaml +++ b/.github/workflows/e2e-arm64.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Prepare id: prep run: | diff --git a/.github/workflows/e2e-azure.yaml b/.github/workflows/e2e-azure.yaml index 614f3bf4..f98159f0 100644 --- a/.github/workflows/e2e-azure.yaml +++ b/.github/workflows/e2e-azure.yaml @@ -20,13 +20,13 @@ jobs: uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.18- + ${{ runner.os }}-go1.20- - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Setup Flux CLI run: | make build diff --git a/.github/workflows/e2e-bootstrap.yaml b/.github/workflows/e2e-bootstrap.yaml index bbd1e57b..5f02846e 100644 --- a/.github/workflows/e2e-bootstrap.yaml +++ b/.github/workflows/e2e-bootstrap.yaml @@ -21,13 +21,13 @@ jobs: uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.18- + ${{ runner.os }}-go1.20- - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Setup Kubernetes uses: helm/kind-action@d8ccf8fb623ce1bb360ae2f45f323d9d5c5e9f00 # v1.5.0 with: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a9c12b64..5c5cd483 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -25,13 +25,13 @@ jobs: uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.18- + ${{ runner.os }}-go1.20- - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Setup Kubernetes uses: helm/kind-action@d8ccf8fb623ce1bb360ae2f45f323d9d5c5e9f00 # v1.5.0 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f417bc7f..7dfa7c68 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Setup QEMU uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2 - name: Setup Docker Buildx diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml index 519dd5d0..3a2c4080 100644 --- a/.github/workflows/scan.yaml +++ b/.github/workflows/scan.yaml @@ -37,7 +37,7 @@ jobs: - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Download modules and build manifests run: | make tidy @@ -65,7 +65,7 @@ jobs: - name: Set up Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Initialize CodeQL uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 with: diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index a967cb64..5de2bb60 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.x + go-version: 1.20.x - name: Update component versions id: update run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9579bdf3..28b9acc5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,7 +67,7 @@ for source changes. Prerequisites: -* go >= 1.19 +* go >= 1.20 * kubectl >= 1.20 * kustomize >= 4.4 * coreutils (on Mac OS) diff --git a/Dockerfile b/Dockerfile index 6a9eba67..79b4ced5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.17 as builder RUN apk add --no-cache ca-certificates curl ARG ARCH=linux/amd64 -ARG KUBECTL_VER=1.26.1 +ARG KUBECTL_VER=1.26.2 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 && \ diff --git a/Makefile b/Makefile index cee323e9..563cd0b1 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ rwildcard=$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call rwildcard,$(d)/,$(2 all: test build tidy: - go mod tidy -compat=1.19 - cd tests/azure && go mod tidy -compat=1.19 + go mod tidy -compat=1.20 + cd tests/azure && go mod tidy -compat=1.20 fmt: go fmt ./...