diff --git a/conformance/base/manifests.yaml b/conformance/base/manifests.yaml index a3163bf837..5e2c23e5bc 100644 --- a/conformance/base/manifests.yaml +++ b/conformance/base/manifests.yaml @@ -705,6 +705,7 @@ spec: - -conf - /root/Corefile image: coredns/coredns + imagePullPolicy: IfNotPresent name: coredns securityContext: allowPrivilegeEscalation: false diff --git a/conformance/utils/kubernetes/apply.go b/conformance/utils/kubernetes/apply.go index 1b3b01d5aa..3f31b308d7 100644 --- a/conformance/utils/kubernetes/apply.go +++ b/conformance/utils/kubernetes/apply.go @@ -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