Skip to content

Commit

Permalink
Merge branch 'improvement/allow-to-set-max-pods' into q/123.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Jul 13, 2022
2 parents e23dc04 + 4c2652c commit 5eeb339
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
remove MetalK8s ISOs from a cluster
(PR[#3730](https://github.com/scality/metalk8s/pull/3730))

- Allow, from the Bootstrap configuration, to manage the maximum
number of pods that can be scheduled on each nodes
(PR[#3821](https://github.com/scality/metalk8s/pull/3821))

### Removals

- The `Statefulsets` Grafana dashboard has been removed
Expand Down
6 changes: 6 additions & 0 deletions docs/installation/bootstrap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ Configuration
hard: []
soft:
- topologyKey: kubernetes.io/hostname
kubelet:
config:
maxPods: 110
The ``networks`` field specifies a range of IP addresses written in CIDR
notation for it's various subfields.
Expand Down Expand Up @@ -269,6 +272,9 @@ defaults kubernetes configuration.
deleting them. If it's set to 0, the terminated pod garbage collector is
disabled (default to ``500``)

From ``kubelet`` section you can override the max number of pods that can
be scheduled on each nodes.

.. _Feature Gates: https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
.. _specific OpenID for kube-apiserver: https://kubernetes.io/docs/reference/access-authn-authz/authentication/#openid-connect-tokens

Expand Down
3 changes: 3 additions & 0 deletions salt/metalk8s/kubernetes/kubelet/standalone.sls
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ Create kubelet config file:
address: {{ grains['metalk8s']['control_plane_ip'] }}
rotateCertificates: false
port: 10250
{%- if pillar.get("kubernetes:kubelet:config:maxPods") %}
maxPods: {{ pillar.kubernetes.kubelet.config.maxPods }}
{%- endif %}
{%- for key, value in kubelet.config.items() %}
{{ key }}: {{ value }}
{%- endfor %}
Expand Down

0 comments on commit 5eeb339

Please sign in to comment.