Skip to content

Commit ab44ea9

Browse files
committed
Properly support multiple embedded manifests
1 parent 83f5206 commit ab44ea9

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

conformance/base/manifests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ spec:
704704
- args:
705705
- -conf
706706
- /root/Corefile
707-
image: coredns/coredns
707+
image: registry.k8s.io/coredns/coredns:v1.12.2
708708
imagePullPolicy: IfNotPresent
709709
name: coredns
710710
securityContext:

conformance/utils/kubernetes/apply.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,18 +340,21 @@ func getContentsFromPathOrURL(manifestFS []fs.FS, location string, timeoutConfig
340340
}
341341
return manifests, nil
342342
}
343-
var err error
344-
var buf []byte
343+
344+
var buffer bytes.Buffer
345345
for _, mfs := range manifestFS {
346-
buf, err = fs.ReadFile(mfs, location)
346+
buf, err := fs.ReadFile(mfs, location)
347347
if err != nil && errors.Is(err, fs.ErrNotExist) {
348348
continue
349349
} else if err != nil {
350350
return nil, err
351351
}
352-
return bytes.NewBuffer(buf), nil
352+
_, err = buffer.Write(buf)
353+
if err != nil {
354+
return nil, err
355+
}
353356
}
354-
return nil, err
357+
return &buffer, nil
355358
}
356359

357360
// convertGatewayAddrsToPrimitives converts a slice of Gateway addresses

0 commit comments

Comments
 (0)