diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 1e59c02c2..e307e5af6 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.24-openshift-4.21 diff --git a/.golangci.yaml b/.golangci.yaml index b71f0aa36..7974ecc95 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -27,10 +27,8 @@ run: issues: exclude-dirs: - vendor - - # default is true. Enables skipping of directories: - # vendor$, third_party$, testdata$, examples$, Godeps$, builtin$ - skip-dirs-use-default: true + exclude-dirs-use-default: true + uniq-by-line: true # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules": # If invoked with -mod=readonly, the go command is disallowed from the implicit @@ -60,9 +58,6 @@ output: # print linter name in the end of issue text, default is true print-linter-name: true - # make issues output unique by line, default is true - uniq-by-line: true - # add a prefix to the output file references; default is no prefix path-prefix: "" diff --git a/Containerfile.external-dns-operator b/Containerfile.external-dns-operator index 508855823..e1d3cce40 100644 --- a/Containerfile.external-dns-operator +++ b/Containerfile.external-dns-operator @@ -9,7 +9,7 @@ COPY Dockerfile . RUN test "$(sha1sum Dockerfile.cached | cut -d' ' -f1)" = "$(sha1sum Dockerfile | cut -d' ' -f1)" -FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder +FROM registry.access.redhat.com/ubi9/go-toolset:1.24 as builder # dummy copy to trigger the drift detection COPY --from=drift /app/Dockerfile.cached . WORKDIR /workspace diff --git a/Dockerfile b/Dockerfile index fdc0b6de3..deec2d597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.24 as builder WORKDIR /opt/app-root/src COPY . . diff --git a/drift-cache/Dockerfile b/drift-cache/Dockerfile index fdc0b6de3..deec2d597 100644 --- a/drift-cache/Dockerfile +++ b/drift-cache/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.24 as builder WORKDIR /opt/app-root/src COPY . . diff --git a/go.mod b/go.mod index 375d9bb21..8c3224cd3 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/openshift/external-dns-operator -go 1.22.0 - -toolchain go1.22.3 +go 1.24.0 require ( github.com/Azure/azure-sdk-for-go v60.1.0+incompatible diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh index d0954050f..78a8d4e03 100755 --- a/hack/golangci-lint.sh +++ b/hack/golangci-lint.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -GOLANGCI_VERSION="1.59.1" +GOLANGCI_VERSION="1.64.8" OUTPUT_PATH=${1:-./bin/golangci-lint} @@ -10,10 +10,10 @@ GOARCH=$(go env GOARCH) case $GOOS in linux) - CHECKSUM="c30696f1292cff8778a495400745f0f9c0406a3f38d8bb12cef48d599f6c7791" + CHECKSUM="b6270687afb143d019f387c791cd2a6f1cb383be9b3124d241ca11bd3ce2e54e" ;; darwin) - CHECKSUM="2f945063394a489c0037f0369c0ce21bc007565c08f90b924a35f4c04721cbc0" + CHECKSUM="b52aebb8cb51e00bfd5976099083fbe2c43ef556cef9c87e58a8ae656e740444" ;; *) echo "Unsupported OS $GOOS"