Skip to content

NE-2142: Bump golang to 1.24 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

NE-2142: Bump golang to 1.24 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc5ec3
UPSTREAM: <carry>: NE-2142: Bump Golang to 1.24
alebedev87 Sep 30, 2025
24660e9
UPSTREAM: <4719>: Use constants for logrus functions
alebedev87 Sep 30, 2025
2fb8636
UPSTREAM: <5462>: Use constants for logrus functions
alebedev87 Sep 30, 2025
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Containerfile.externaldns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY Dockerfile.openshift Dockerfile
# drift-cache/Dockerfile can be updated with the upstream contents once the Konflux version is aligned.
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
4 changes: 2 additions & 2 deletions Dockerfile.openshift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM golang:1.24 as builder
WORKDIR /sigs.k8s.io/external-dns
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /usr/bin/
ENTRYPOINT ["/usr/bin/external-dns"]
LABEL io.openshift.release.operator="true"
Expand Down
4 changes: 2 additions & 2 deletions drift-cache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM golang:1.24 as builder
WORKDIR /sigs.k8s.io/external-dns
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /usr/bin/
ENTRYPOINT ["/usr/bin/external-dns"]
LABEL io.openshift.release.operator="true"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/external-dns

go 1.22.2
go 1.24.0

require (
cloud.google.com/go/compute/metadata v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions provider/bluecat/gateway/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestBluecatExpandZones(t *testing.T) {
got := expandZone(tc.input)
diff := cmp.Diff(tc.want, got)
if diff != "" {
t.Fatalf(diff)
t.Fatalf("%s", diff)
}
})
}
Expand Down Expand Up @@ -91,7 +91,7 @@ func TestBluecatSplitProperties(t *testing.T) {
got := SplitProperties(tc.input)
diff := cmp.Diff(tc.want, got)
if diff != "" {
t.Fatalf(diff)
t.Fatalf("%s", diff)
}
})
}
Expand Down
4 changes: 2 additions & 2 deletions provider/tencentcloud/cloudapi/tencentapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func dealWithError(action Action, request string, err error) bool {
}

func APIErrorRecord(apiAction Action, request string, response string, err error) {
log.Infof(fmt.Sprintf("APIError API: %s/%s Request: %s, Response: %s, Error: %s", apiAction.Service, apiAction.Name, request, response, err.Error()))
log.Infof("APIError API: %s/%s Request: %s, Response: %s, Error: %s", apiAction.Service, apiAction.Name, request, response, err.Error())
}

func APIRecord(apiAction Action, request string, response string) {
Expand All @@ -267,7 +267,7 @@ func APIRecord(apiAction Action, request string, response string) {
if apiAction.ReadOnly {
// log.Infof(message)
} else {
log.Infof(message)
log.Infof("%s", message)
}
}

Expand Down
4 changes: 2 additions & 2 deletions provider/vinyldns/vinyldns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (p *vinyldnsProvider) Records(ctx context.Context) (endpoints []*endpoint.E
continue
}

log.Infof(fmt.Sprintf("Zone: [%s:%s]", zone.ID, zone.Name))
log.Infof("Zone: [%s:%s]", zone.ID, zone.Name)
records, err := p.client.RecordSets(zone.ID)
if err != nil {
return nil, err
Expand All @@ -101,7 +101,7 @@ func (p *vinyldnsProvider) Records(ctx context.Context) (endpoints []*endpoint.E
for _, r := range records {
if provider.SupportedRecordType(r.Type) {
recordsCount := len(r.Records)
log.Debugf(fmt.Sprintf("%s.%s.%d.%s", r.Name, r.Type, recordsCount, zone.Name))
log.Debugf("%s.%s.%d.%s", r.Name, r.Type, recordsCount, zone.Name)

// TODO: AAAA Records
if len(r.Records) > 0 {
Expand Down