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

Adding multus v4.1.4 manifest #3154

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Conversation

jaydeokar
Copy link
Contributor

@jaydeokar jaydeokar commented Dec 13, 2024

What type of PR is this?
manifest

Which issue does this PR fix?:
Adds multus v4.1.4 thick plugin manifest

What does this PR do / Why do we need it?:
v4.1.4 has the latest bug fixes and improvements

Testing done on this change:
Ran integration suite against new version.. It passed without issue

• [0.148 seconds]
------------------------------

Ran 1 of 1 Specs in 1.743 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 0 Skipped
PASS

Ginkgo ran 1 suite in 5.628199489s
Test Suite Passed
all tests ran successfully in 0 minutes and 7 seconds

Will this PR introduce any new dependencies?: N/A

Will this break upgrades or downgrades? Has updating a running cluster been tested?:
N/A

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

Does this PR introduce any user-facing change?: N/A


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

@jaydeokar jaydeokar marked this pull request as ready for review December 13, 2024 21:11
@jaydeokar jaydeokar requested a review from a team as a code owner December 13, 2024 21:11
@orsenthil
Copy link
Member

We have a multus specific integration suite - https://github.com/aws/amazon-vpc-cni-k8s/tree/master/test/integration/multus - I assume this was run. Is that correct?

@jaydeokar
Copy link
Contributor Author

We have a multus specific integration suite - https://github.com/aws/amazon-vpc-cni-k8s/tree/master/test/integration/multus - I assume this was run. Is that correct?

Yes, I ran this integration suite on my local cluster.
There are some RBAC changes and manifest updates which I added from upstream..

diff v4.0.2-eksbuild.1 v4.1.4-eksbuild.1
diff --color v4.0.2-eksbuild.1/multus-daemonset-thick.yml v4.1.4-eksbuild.1/multus-daemonset-thick.yml
63a64
>       - list
64a66
>       - watch
110a113
>         "logToStderr": true,
162c165
<           image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/multus-cni:v4.0.2-eksbuild.1_thick
---
>           image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/multus-cni:v4.1.4-eksbuild.1_thick
172a176
>           terminationMessagePolicy: FallbackToLogsOnError
175a180,187
>            # multus-daemon expects that cnibin path must be identical between pod and container host.
> 
>             # e.g. if the cni bin is in '/opt/cni/bin' on the container host side, then it should be mount to '/opt/cni/bin' in multus-daemon,
> 
>             # not to any other directory, like '/opt/bin' or '/usr/bin'.
> 
>             - name: cnibin
>               mountPath: /opt/cni/bin
181a194
>               mountPropagation: HostToContainer
192a206,210
>           env:
>             - name: MULTUS_NODE_NAME
>               valueFrom:
>                 fieldRef:
>                   fieldPath: spec.nodeName
195c213
<           image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/multus-cni:v4.0.2-eksbuild.1_thick
---
>           image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/multus-cni:v4.1.4-eksbuild.1_thick
205a224
>           terminationMessagePolicy: FallbackToLogsOnError

@jaydeokar jaydeokar merged commit ec4f86d into aws:master Dec 13, 2024
5 of 6 checks passed
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.

2 participants