Skip to content

Allow preprepared CoreDNS image to be used #3906

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

Merged
k8s-ci-robot merged 2 commits into from
Sep 8, 2025
Merged

Allow preprepared CoreDNS image to be used #3906

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
7f612b9
Switch to registry.k8s.io/coredns/coredns, only pull if not present
aaronjwood Jul 8, 2025
d868a0d
Properly support multiple embedded manifests
aaronjwood Jul 8, 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
3 changes: 2 additions & 1 deletion conformance/base/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,8 @@ spec:
- args:
- -conf
- /root/Corefile
image: coredns/coredns
image: registry.k8s.io/coredns/coredns:v1.12.2
imagePullPolicy: IfNotPresent
name: coredns
securityContext:
allowPrivilegeEscalation: false
Expand Down
13 changes: 8 additions & 5 deletions conformance/utils/kubernetes/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,18 +340,21 @@ func getContentsFromPathOrURL(manifestFS []fs.FS, location string, timeoutConfig
}
return manifests, nil
}
var err error
var buf []byte

var buffer bytes.Buffer
for _, mfs := range manifestFS {
buf, err = fs.ReadFile(mfs, location)
buf, err := fs.ReadFile(mfs, location)
if err != nil && errors.Is(err, fs.ErrNotExist) {
continue
} else if err != nil {
return nil, err
}
return bytes.NewBuffer(buf), nil
_, err = buffer.Write(buf)
if err != nil {
return nil, err
}
}
return nil, err
return &buffer, nil
}

// convertGatewayAddrsToPrimitives converts a slice of Gateway addresses
Expand Down