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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a744e
metrics_server: add extras nodeselector, affinity, tolerations
pli01 Apr 11, 2023
ec8df4e
fix tolerations invalid YAML if undefined
pli01 Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions roles/kubernetes-apps/metrics_server/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ metrics_server_requests_cpu: 100m
metrics_server_requests_memory: 200Mi
metrics_server_host_network: false
metrics_server_replicas: 1
# metrics_server_extra_tolerations: []
# metrics_server_extra_affinity: {}
# metrics_server_nodeselector: {}
14 changes: 13 additions & 1 deletion roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,17 @@ spec:
volumes:
- name: tmp
emptyDir: {}
{% if not masters_are_not_tainted %}
{% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %}
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!

- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
{% if metrics_server_extra_tolerations is defined %}
{{ metrics_server_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
{% endif %}
affinity:
podAntiAffinity:
Expand All @@ -105,3 +110,10 @@ spec:
topologyKey: kubernetes.io/hostname
namespaces:
- kube-system
{% if metrics_server_extra_affinity is defined %}
{{ metrics_server_extra_affinity | to_nice_yaml | indent(width=8) }}
{% endif %}
{% if metrics_server_nodeselector is defined %}
nodeSelector:
{{ metrics_server_nodeselector | to_nice_yaml | indent(width=8) }}
{% endif %}