diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6c6a549c..02935d2e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,12 +16,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Setup Go 1.24 + - name: Setup Go 1.27.3 uses: actions/setup-go@v5 with: - go-version: 1.24 + go-version: 1.27.3 - name: Lint uses: golangci/golangci-lint-action@v7 with: only-new-issues: true - version: v2.1.5 + version: v2.15.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d04f6a4f..ecc647b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,11 +73,11 @@ jobs: repository: ${{ env.DOCKERHUB_IMAGE }} readme-filepath: ./README.md short-description: "Cloudflare Operator Controller Manager" - - name: Setup Go 1.24 + - name: Setup Go 1.27.3 uses: actions/setup-go@v5 if: startsWith(github.ref, 'refs/tags/') with: - go-version: 1.24 + go-version: 1.27.3 - name: Resolve installer image base if: startsWith(github.ref, 'refs/tags/') run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3841e301..ed66356d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup Go 1.24 + - name: Setup Go 1.27.3 uses: actions/setup-go@v5 with: - go-version: 1.24 + go-version: 1.27.3 - name: Test run: make test - name: Archive code coverage results diff --git a/Dockerfile b/Dockerfile index cb1b130f..0fea2d6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.24 AS builder +FROM golang:1.27.3 AS builder ARG TARGETOS ARG TARGETARCH @@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot +FROM gcr.io/distroless/static-debian13:nonroot WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/Makefile b/Makefile index d1fc0aa2..4b9b1aa1 100644 --- a/Makefile +++ b/Makefile @@ -215,9 +215,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint ## Tool Versions KUSTOMIZE_VERSION ?= v5.4.3 -CONTROLLER_TOOLS_VERSION ?= v0.16.1 +CONTROLLER_TOOLS_VERSION ?= v0.22.0 ENVTEST_VERSION ?= release-0.19 -GOLANGCI_LINT_VERSION ?= v2.1.5 +GOLANGCI_LINT_VERSION ?= v2.15.0 .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. diff --git a/go.mod b/go.mod index 8b831b20..6671cfbf 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/adyanth/cloudflare-operator go 1.24.0 -toolchain go1.24.2 +toolchain go1.27.3 require ( github.com/cloudflare/cloudflare-go v0.115.0