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

metrics_server: add extras nodeselector, affinity, tolerations #9972

Merged
merged 2 commits into from
Apr 26, 2023
Merged

metrics_server: add extras nodeselector, affinity, tolerations #9972

merged 2 commits into from
Apr 26, 2023

Conversation

pli01
Copy link
Contributor

@pli01 pli01 commented Apr 11, 2023 •
edited by floryut
Loading

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test

/kind feature

/kind flake

What this PR does / why we need it:

This PR add optional extra vars to metrics-server template role :

  • nodeselector
  • extra affinity
  • extra tolerations

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

MetricsServer: Add extras nodeselector, affinity, tolerations (using `metrics_server_nodeselector`, `metrics_server_extra_affinity` ,`metrics_server_extra_tolerations`)

@k8s-ci-robot k8s-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label Apr 11, 2023
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 11, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @pli01. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 11, 2023
@pli01 pli01 force-pushed the metrics-server-add-extras branch from 04fc001 to c9a4ee6 Compare April 12, 2023 06:50
oomichi
oomichi reviewed Apr 14, 2023
View reviewed changes
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
tolerations:
{% if not masters_are_not_tainted %}
Copy link
Contributor

Choose a reason for hiding this comment

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

If masters_are_not_tainted is true and metrics_server_extra_tolerations is not defined, the above tolerations becomes empty and that leads an error due to invalid YAML format.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have commit a fix:
add tolerations key , if masters_are_not_tainted is false or metrics_server_extra_tolerations is defined

With this condition is that ok ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hi @oomichi ,

now, It seems that the CI failed on error outside of this PR

Due to calico mismatch checksum

fatal: [instance-1 -> instance-1]: FAILED! => {"attempts": 4, "changed": true, "checksum_dest": null, "checksum_src": "122ff30c76923425b04a5c8915b6a164b813b0fb", "dest": "/builds/kargo-ci/kubernetes-sigs-kubespray/downloads/calico-v3.25.1-kdd-crds/v3.25.1.tar.gz", "elapsed": 1, "msg": "The checksum for /builds/kargo-ci/kubernetes-sigs-kubespray/downloads/calico-v3.25.1-kdd-crds/v3.25.1.tar.gz did not match 361b0e0e6d64156f0e1b2fbfd18d13217d188eee614eec5de6b05ac0deaab372; it was 4d6b6653499f24f80a85a0a7dac28d9571cabfa25356b08f3b438fd97e322e2d.", "src": "/home/kubespray/.ansible/tmp/ansible-tmp-1681554791.7329743-3253-129198476346473/tmpi_gxw4px", "url": "https://github.com/projectcalico/calico/archive/v3.25.1.tar.gz"}

https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/4119243029#L3913

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have fix calico checksum in this PR #9990

Copy link
Contributor

Choose a reason for hiding this comment

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

@pli01 Thanks for fixing the calico checksum issue on another pull request!

@pli01 pli01 force-pushed the metrics-server-add-extras branch 3 times, most recently from 5333191 to 91bedc4 Compare April 17, 2023 20:45
@pli01 pli01 force-pushed the metrics-server-add-extras branch from 91bedc4 to ec8df4e Compare April 20, 2023 18:55
oomichi
oomichi reviewed Apr 24, 2023
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

Thanks for updating.
Current one seems good for me.

/ok-to-test
/approve

roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
tolerations:
{% if not masters_are_not_tainted %}
Copy link
Contributor

Choose a reason for hiding this comment

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

@pli01 Thanks for fixing the calico checksum issue on another pull request!

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 24, 2023
floryut
floryut approved these changes Apr 25, 2023
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

@pli01 Thank you, looks good!
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, oomichi, pli01

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 25, 2023
@oomichi
Copy link
Contributor

oomichi commented Apr 26, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot merged commit 8727f88 into kubernetes-sigs:master Apr 26, 2023
@yankay yankay mentioned this pull request May 15, 2023
Closed
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
@pli01 @pedromcpedro
metrics_server: add extras nodeselector, affinity, tolerations (kuber…
d385b5a 
…netes-sigs#9972)

* metrics_server: add extras nodeselector, affinity, tolerations

* fix tolerations invalid YAML if undefined
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oomichi oomichi oomichi left review comments

@floryut floryut floryut approved these changes

@jayonlau jayonlau Awaiting requested review from jayonlau

@yankay yankay Awaiting requested review from yankay

Assignees

@floryut floryut

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pli01 @k8s-ci-robot @oomichi @floryut