Skip to content

Commit

Permalink
Merge branches 'w/127.0/bugfix/fix-get-method-maxPods' and 'q/4200/12…
Browse files Browse the repository at this point in the history
…6.0/bugfix/fix-get-method-maxPods' into tmp/octopus/q/127.0
  • Loading branch information
bert-e committed Nov 28, 2023
3 parents a1faa3b + e599320 + 5f663fc commit 75c7bf4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@
- Fix a bug in retry logic for ETCd backup
(PR[4197](https://github.com/scality/metalk8s/pull/4197))

- Fix the `get` method for the `maxPods` value
(PR[4200](https://github.com/scality/metalk8s/pull/4200))

## Release 125.0.6

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion salt/metalk8s/kubernetes/kubelet/standalone.sls
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Create kubelet config file:
address: {{ grains['metalk8s']['control_plane_ip'] }}
rotateCertificates: false
port: 10250
{%- if pillar.get("kubernetes:kubelet:config:maxPods") %}
{%- if salt.pillar.get("kubernetes:kubelet:config:maxPods") %}
maxPods: {{ pillar.kubernetes.kubelet.config.maxPods }}
{%- endif %}
systemReserved:
Expand Down

0 comments on commit 75c7bf4

Please sign in to comment.