Skip to content

Alibabacloud fixes#18762

Merged
jibi merged 2 commits intocilium:masterfrom
ctripcloud:alibaba-fixes-upstream
Feb 15, 2022
Merged

Alibabacloud fixes#18762
jibi merged 2 commits intocilium:masterfrom
ctripcloud:alibaba-fixes-upstream

Conversation

@jaffcheng
Copy link
Copy Markdown
Contributor

Please see commit msg

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>
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
@jaffcheng jaffcheng requested a review from twpayne 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
Copy Markdown
Contributor Author

CC @l1b0k

@twpayne
Copy link
Copy Markdown
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
Copy link
Copy Markdown
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!

@twpayne twpayne added needs-backport/1.10 ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Feb 11, 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
@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 removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2022
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

None yet

Development

Successfully merging this pull request may close these issues.

7 participants