Skip to content
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.

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

Manifest for Multus 4.0.2 thick plugin support #2667

Merged
merged 1 commit into from
Nov 16, 2023

Conversation

jdn5126
Copy link
Contributor

@jdn5126 jdn5126 commented Nov 15, 2023

What type of PR is this?

dependency

Which issue does this PR fix:
N/A

What does this PR do / Why do we need it:
This PRs adds a new manifest for Multus CNI v4.0.2 (https://github.com/k8snetworkplumbingwg/multus-cni/releases/tag/v4.0.2). The AWS-built image in this manifest has been validated against the latest VPC CNI. Note that we are only publishing the thick plugin currently. Additionally publishing the thin plugin is future work.

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
N/A

Testing done on this change:

Manually verified that this manifest can be applied to an existing cluster. Multus pods come up and pod IPs are assigned. The existing multus integration test checks no longer apply now that the multus architecture has changed. The existing log checks are no longer present.

Will this PR introduce any new dependencies?:

Will this break upgrades or downgrades? Has updating a running cluster been tested?:
No, Yes

Does this change require updates to the CNI daemonset config files to work?:

No

Does this PR introduce any user-facing change?:

Yes

Provide manifest for compatibility with Multus v4.0.2

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@jdn5126 jdn5126 requested a review from a team as a code owner November 15, 2023 22:54
Copy link
Contributor

@haouc haouc left a comment

Choose a reason for hiding this comment

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

lgtm

@jdn5126 jdn5126 merged commit 0998bb3 into aws:master Nov 16, 2023
6 checks passed
@jdn5126 jdn5126 deleted the multus4.0.2 branch November 16, 2023 16:54
@emmanuel
Copy link

Thanks for publishing an updated manifest.

Where can I find the Dockerfile(s) from which the Multus image(s) is (are) built?

@jdn5126
Copy link
Contributor Author

jdn5126 commented Nov 16, 2023

@emmanuel we build using the upstream Multus Dockerfile, so for the v4.0.2 thick plugin, that is https://github.com/k8snetworkplumbingwg/multus-cni/blob/v4.0.2/images/Dockerfile.thick

We also construct the manifest from the upstream Multus manifest, so for the v4.0.2 thick plugin, that is https://github.com/k8snetworkplumbingwg/multus-cni/blob/v4.0.2/deployments/multus-daemonset-thick.yml

@emmanuel
Copy link

@jdn5126 thank you. I wonder then, where does the (AWS-specific) entrypoint.sh which is the entrypoint of the image distributed here come from?

@jdn5126
Copy link
Contributor Author

jdn5126 commented Nov 17, 2023

@jdn5126 thank you. I wonder then, where does the (AWS-specific) entrypoint.sh which is the entrypoint of the image distributed here come from?

There's no entrypoint.sh in v4.0.2, but in past releases, that also came from Multus upstream: https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/images/README.md#entrypointsh-parameters

The only thing AWS-specific here is that the image is hosted in private ECRs. When needed, we sometimes build Multus against an EKS Distro minimal base image and carry CVE patches. So we want to maintain that flexibility.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants