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

plugins/cilium-cni: fix aws-cni cni chaining #15915

Merged
merged 1 commit into from May 4, 2021
Merged

Conversation

aanm
Copy link
Member

@aanm aanm commented Apr 28, 2021

AWS-CNI seems to require more fields than the ones hard coded in Cilium
image. This patch adds the missing fields.

Error messages that might show up in pod describe are similar as:

network: invalid character '{' after top-level value

or

\n{\n    \"code\": 100,\n    \"msg\": \"add cmd: failed to assign an IP address to container\"\n}": invalid character '{' after top-level value

Signed-off-by: André Martins andre@cilium.io

Fix aws-cni integration where pods were not being scheduled

AWS-CNI seems to require more fields than the ones hard coded in Cilium
image. This patch adds the missing fields.

Error messages that might show up in pod describe are similar as:
```
network: invalid character '{' after top-level value
```
or
```
\n{\n    \"code\": 100,\n    \"msg\": \"add cmd: failed to assign an IP address to container\"\n}": invalid character '{' after top-level value
```

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.9 labels Apr 28, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.7 Apr 28, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.0-rc2 Apr 28, 2021
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

This matches the reported fixes in aws/amazon-vpc-cni-k8s#1314 .

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

LGTM, can you provide more context like linking what changed in the aws-cni in the commit msg itself?

@aanm
Copy link
Member Author

aanm commented Apr 29, 2021

test-me-please

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.10 Apr 29, 2021
@aanm aanm marked this pull request as ready for review April 29, 2021 11:14
@aanm aanm requested review from a team and errordeveloper April 29, 2021 11:14
@errordeveloper
Copy link
Contributor

@christarazi I had a quick look and couldn't easily find anything, it'd be helpful to know which version worked and which one broke.

@aanm
Copy link
Member Author

aanm commented May 3, 2021

test-1.16-netnext (previous https://jenkins.cilium.io/job/Cilium-PR-K8s-1.16-net-next/409/)

@aanm
Copy link
Member Author

aanm commented May 4, 2021

hitting #15998

@aanm aanm merged commit ea381e7 into cilium:master May 4, 2021
@aanm aanm deleted the pr/fix-aws-cni branch May 4, 2021 15:45
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.10 May 4, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.10 May 6, 2021
@brb brb mentioned this pull request May 7, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.7 May 7, 2021
@brb brb mentioned this pull request May 7, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.0-rc2 May 7, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.0-rc2 May 7, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.7 May 10, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.0-rc2 May 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.10.0-rc2
Backport done to v1.10
1.8.10
Backport done to v1.8
1.9.7
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

7 participants