[katiewasnothere]

Type of Change

• New feature

Motivation and Context

This PR adds a new flag to the k8s create command to allow users to specify an optional path to a CNI manifest that they wish to use for the cluster instead of the bundled kindnet CNI manifest.

I tested this with cilium by doing the following:

% helm template cilium cilium/cilium \
    --version 1.20.1 \
    --namespace kube-system \
    --set ipam.mode=cluster-pool \
    --set ipam.operator.clusterPoolIPv4PodCIDRList='{<TARGETCIDR>}' \
    --set kubeProxyReplacement=false > /tmp/cilium.yaml
% container k8s create --cni /tmp/cilium.yaml

Testing

• Tested locally
• Added/updated tests
• Added/updated docs

[github-actions]

Code Coverage

Tier	Line Coverage
Unit	24.85%
Integration	66.64%
Combined	76.06%

[egernst]

• Consider adding the example usage in the PR description?
• Can you add example to the kubernetes.md?

[egernst]

Cool -- looks good Kathryn. Thanks for the updated docs/example

[egernst]

Can things get weird here if the user submits a yaml that "accidentally" includes EOF? Should we feed it a real stdin, or base64-encoding the payload, or?

[egernst]

Also, I think a particularly large manifest may hit E2BIG - I think this would also be solved if we considered a pipe?

[katiewasnothere]

I don't know what the right answer for this is from a UX perspective. I'd like to investigate that in a separate PR if that's okay with you.

[egernst]

Yeah, I think the UX would be the same, just a matter of how we handle it. I'm fine doing this as a follow up. #2273

[egernst]

should we do/catch so we can print out the actual error (could be a read error as well?)

[egernst]

I think this is effectively covering the same as customPathReturnsItsContents().

A local friend of mine had this suggestion:

Line 76 already asserted result == contents, and contents is the literal "custom-cni-marker". So by the time you reach line 77, result is known to be that string, which self-evidently doesn't contain "kindnet". The assertion is true as a consequence of the previous line — it has no independent power to catch anything.