Skip to content

Commit d91f48d

Browse files
committed
NE-2142: Bump Golang to 1.24
This commit also updates golangci-lint to 1.64.8.
1 parent 3c403c5 commit d91f48d

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.17
4+
tag: rhel-9-release-golang-1.24-openshift-4.21

.golangci.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ run:
2727
issues:
2828
exclude-dirs:
2929
- vendor
30-
31-
# default is true. Enables skipping of directories:
32-
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
33-
skip-dirs-use-default: true
30+
exclude-dirs-use-default: true
31+
uniq-by-line: true
3432

3533
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
3634
# If invoked with -mod=readonly, the go command is disallowed from the implicit
@@ -60,9 +58,6 @@ output:
6058
# print linter name in the end of issue text, default is true
6159
print-linter-name: true
6260

63-
# make issues output unique by line, default is true
64-
uniq-by-line: true
65-
6661
# add a prefix to the output file references; default is no prefix
6762
path-prefix: ""
6863

Containerfile.external-dns-operator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY Dockerfile .
99
RUN test "$(sha1sum Dockerfile.cached | cut -d' ' -f1)" = "$(sha1sum Dockerfile | cut -d' ' -f1)"
1010

1111

12-
FROM registry.access.redhat.com/ubi9/go-toolset:1.22 as builder
12+
FROM registry.access.redhat.com/ubi9/go-toolset:1.24 as builder
1313
# dummy copy to trigger the drift detection
1414
COPY --from=drift /app/Dockerfile.cached .
1515
WORKDIR /workspace

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 as builder
2+
FROM golang:1.24 as builder
33

44
WORKDIR /opt/app-root/src
55
COPY . .

drift-cache/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 as builder
2+
FROM golang:1.24 as builder
33

44
WORKDIR /opt/app-root/src
55
COPY . .

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/openshift/external-dns-operator
22

3-
go 1.22.0
4-
5-
toolchain go1.22.3
3+
go 1.24.0
64

75
require (
86
github.com/Azure/azure-sdk-for-go v60.1.0+incompatible

hack/golangci-lint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
GOLANGCI_VERSION="1.59.1"
4+
GOLANGCI_VERSION="1.64.8"
55

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

@@ -10,10 +10,10 @@ GOARCH=$(go env GOARCH)
1010

1111
case $GOOS in
1212
linux)
13-
CHECKSUM="c30696f1292cff8778a495400745f0f9c0406a3f38d8bb12cef48d599f6c7791"
13+
CHECKSUM="b6270687afb143d019f387c791cd2a6f1cb383be9b3124d241ca11bd3ce2e54e"
1414
;;
1515
darwin)
16-
CHECKSUM="2f945063394a489c0037f0369c0ce21bc007565c08f90b924a35f4c04721cbc0"
16+
CHECKSUM="b52aebb8cb51e00bfd5976099083fbe2c43ef556cef9c87e58a8ae656e740444"
1717
;;
1818
*)
1919
echo "Unsupported OS $GOOS"

0 commit comments

Comments
 (0)