Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 2 additions & 7 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""

Expand Down
2 changes: 1 addition & 1 deletion Containerfile.external-dns-operator
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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 . .
Expand Down
2 changes: 1 addition & 1 deletion drift-cache/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 . .
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions hack/golangci-lint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -e

GOLANGCI_VERSION="1.59.1"
GOLANGCI_VERSION="1.64.8"

OUTPUT_PATH=${1:-./bin/golangci-lint}

Expand All @@ -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"
Expand Down