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.

Sign up for GitHub

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

Jump to bottom

Alibabacloud fixes #18762

Merged
merged 2 commits into from
Feb 15, 2022
Merged

Alibabacloud fixes #18762

merged 2 commits into from
Feb 15, 2022

Conversation

jaffcheng
Copy link
Contributor

Please see commit msg

@jaffcheng
alibabacloud: Fix panic due to invalid metric name
c41c6a0 
error message:

panic: descriptor Desc{fqName: "cilium_operator_alibaba-cloud_api_duration_seconds", help:
"Duration of interactions with API", constLabels: {}, variableLabels: [operation response_code]} is invalid:
"cilium_operator_alibaba-cloud_api_duration_seconds" is not a valid metric name

Signed-off-by: Jaff Cheng <jaff.cheng.sh@gmail.com>
@jaffcheng
alibabacloud: Read pre-allocate from CNI config
1ce514c 
Currently, cilium-agent using alibaba ipam mode doesn't
respect pre-allocate configuration from CNI config file when
creating ciliumnode resource, and the value of pre-allocate
is always the default value 8.

This patch makes this option configurable via CNI config.

Signed-off-by: Jaff Cheng <jaff.cheng.sh@gmail.com>
@jaffcheng jaffcheng requested a review from a team February 10, 2022 11:28
@jaffcheng jaffcheng requested a review from a team as a code owner February 10, 2022 11:28
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 10, 2022
@jaffcheng
Copy link
Contributor Author

CC @l1b0k

@twpayne
Copy link
Contributor

twpayne commented Feb 11, 2022

/test

@twpayne twpayne added release-note/minor This PR changes functionality that users may find relevant to operating Cilium. release-note/misc This PR makes changes that have no direct user impact. labels Feb 11, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 11, 2022
@twpayne twpayne removed the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Feb 11, 2022
twpayne
twpayne approved these changes Feb 11, 2022
View reviewed changes
Copy link
Contributor

@twpayne twpayne left a comment

Choose a reason for hiding this comment

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

Thanks!

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.8 Feb 11, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.11.2 Feb 11, 2022
@twpayne twpayne added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 14, 2022
@jibi jibi merged commit 842f6c8 into cilium:master Feb 15, 2022
@jaffcheng jaffcheng deleted the alibaba-fixes-upstream branch February 15, 2022 10:26
@nebril nebril mentioned this pull request Feb 17, 2022
Merged
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2022
@nebril nebril added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed needs-backport/1.10 labels Feb 17, 2022
@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.8 Feb 17, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2022
@nebril nebril mentioned this pull request Feb 17, 2022
Merged
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.11.2 Feb 17, 2022
@joestringer joestringer added this to Backport pending to v1.10 in 1.10.9 Feb 23, 2022
@joestringer joestringer removed this from Backport pending to v1.10 in 1.10.8 Feb 23, 2022
@joestringer joestringer mentioned this pull request Feb 23, 2022
Merged
@aanm aanm added this to Backport pending to v1.10 in 1.10.10 Mar 26, 2022
@aanm aanm removed this from Backport pending to v1.10 in 1.10.9 Mar 26, 2022
@aanm aanm mentioned this pull request Mar 26, 2022
Merged
@qmonnet qmonnet added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. backport-done/1.10 and removed backport-pending/1.11 labels Mar 28, 2022
@joestringer joestringer moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.10 Apr 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twpayne twpayne twpayne approved these changes

Assignees
No one assigned
Labels
backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.10.10
Backport done to v1.10
1.11.2
Backport pending to v1.10
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jaffcheng @twpayne @jibi @nebril @qmonnet