Skip to content

OCPBUGS-87352: Updating coredns-container image to be consistent with ART for 5.0 #189

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
aswinsuryan wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −8
Open

OCPBUGS-87352: Updating coredns-container image to be consistent with ART for 5.0 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3b27d5
Updating coredns-container image to be consistent with ART for 5.0
Jun 6, 2026
62c0e7e
Align Go version files to -1.26
aswinsuryan Jun 16, 2026
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.25-openshift-4.22
tag: rhel-9-release-golang-1.26-openshift-5.0
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.6
1.26.3
4 changes: 2 additions & 2 deletions Dockerfile.ocp
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.25-openshift-4.22 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder
WORKDIR /go/src/github.com/coredns/coredns
COPY . .
RUN GO111MODULE=on GOFLAGS=-mod=vendor go build -o coredns .

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
COPY --from=builder /go/src/github.com/coredns/coredns/coredns /usr/bin/

ENTRYPOINT ["/usr/bin/coredns"]
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
Expand Up @@ -2,7 +2,7 @@ module github.com/coredns/coredns

// Note this minimum version requirement. CoreDNS supports the last two
// Go versions. This follows the upstream Go project support.
go 1.25.0
go 1.26.3

@Thealisyed Thealisyed Jun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The go directive is set to 1.26.3 rather than 1.26.0. Was that intentional?
Typically the go directive tracks the minimum language version needed and pinning to a patch forces all consumers to have at least that patch. The .go-version file at 1.26.3 is fine since that controls the local toolchain but go.mod could arguably stay at 1.26.0?

@aswinsuryan aswinsuryan Jun 26, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.26.0 flagged by coderabbit [1] due to security vulnerabilities hence updated to 1.26.3

[1] #189 (comment)


require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion plugin/dns64/dns64_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ func TestDNS64(t *testing.T) {
}
actual := rec.Msg
if actual.Rcode != rc {
t.Fatalf("ServeDNS should return real result code %q != %q", actual.Rcode, rc)
t.Fatalf("ServeDNS should return real result code %d != %d", actual.Rcode, rc)

@Thealisyed Thealisyed Jun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were these flagged by go vet under 1.26 or caught manually? Just want to confirm the build actually fails without these on the new toolchain.

@aswinsuryan aswinsuryan Jun 26, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, that is right the build was failing and these where flagged by go vet.

}

if !reflect.DeepEqual(actual, tc.resp) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/file/secondary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestShouldTransfer(t *testing.T) {
t.Fatalf("Unable to run shouldTransfer: %v", err)
}
if !should {
t.Fatalf("ShouldTransfer should return true for serial: %q", soa.serial-1)
t.Fatalf("ShouldTransfer should return true for serial: %d", soa.serial-1)
}
// Serial equal
z.SOA = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial))
Expand Down
2 changes: 1 addition & 1 deletion plugin/test/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func Section(tc Case, sec sect, rr []dns.RR) error {
return fmt.Errorf("MX Mx should be %q, but is %q", tt.Mx, x.Mx)
}
if x.Preference != tt.Preference {
return fmt.Errorf("MX Preference should be %q, but is %q", tt.Preference, x.Preference)
return fmt.Errorf("MX Preference should be %d, but is %d", tt.Preference, x.Preference)
}
case *dns.NS:
tt := section[i].(*dns.NS)
Expand Down