Skip to content

Commit 4b2995d

Browse files
authored
Merge pull request #541 from teskje/memory_swap
feat: k8s: support setting the `memorySwap.swapBehavior` kubelet config
2 parents 37d2cb4 + b32e5f5 commit 4b2995d

File tree

6 files changed

+54
-38
lines changed

6 files changed

+54
-38
lines changed

packages/kubernetes-1.30/kubelet-config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,7 @@ reservedMemory:
200200
reservedSystemCPUs: {{settings.kubernetes.reserved-cpus}}
201201
{{/if}}
202202
failSwapOn: false
203+
{{#if settings.kubernetes.memory-swap-behavior}}
204+
memorySwap:
205+
swapBehavior: {{settings.kubernetes.memory-swap-behavior}}
206+
{{/if}}

packages/kubernetes-1.31/kubelet-config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,7 @@ reservedMemory:
200200
reservedSystemCPUs: {{settings.kubernetes.reserved-cpus}}
201201
{{/if}}
202202
failSwapOn: false
203+
{{#if settings.kubernetes.memory-swap-behavior}}
204+
memorySwap:
205+
swapBehavior: {{settings.kubernetes.memory-swap-behavior}}
206+
{{/if}}

packages/kubernetes-1.32/kubelet-config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ reservedMemory:
200200
reservedSystemCPUs: {{settings.kubernetes.reserved-cpus}}
201201
{{/if}}
202202
failSwapOn: false
203+
{{#if settings.kubernetes.memory-swap-behavior}}
204+
memorySwap:
205+
swapBehavior: {{settings.kubernetes.memory-swap-behavior}}
206+
{{/if}}
203207
{{#if settings.kubernetes.single-process-oom-kill}}
204208
singleProcessOOMKill: {{settings.kubernetes.single-process-oom-kill}}
205209
{{/if}}

packages/kubernetes-1.33/kubelet-config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ reservedMemory:
200200
reservedSystemCPUs: {{settings.kubernetes.reserved-cpus}}
201201
{{/if}}
202202
failSwapOn: false
203+
{{#if settings.kubernetes.memory-swap-behavior}}
204+
memorySwap:
205+
swapBehavior: {{settings.kubernetes.memory-swap-behavior}}
206+
{{/if}}
203207
{{#if settings.kubernetes.single-process-oom-kill}}
204208
singleProcessOOMKill: {{settings.kubernetes.single-process-oom-kill}}
205209
{{/if}}

sources/Cargo.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sources/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ base64 = "0.22"
211211

212212
[workspace.dependencies.bottlerocket-modeled-types]
213213
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
214-
tag = "bottlerocket-settings-models-v0.10.0"
215-
version = "0.9.0"
214+
tag = "bottlerocket-settings-models-v0.11.0"
215+
version = "0.10.0"
216216

217217
[workspace.dependencies.bottlerocket-settings-models]
218218
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
219-
tag = "bottlerocket-settings-models-v0.10.0"
220-
version = "0.10.0"
219+
tag = "bottlerocket-settings-models-v0.11.0"
220+
version = "0.11.0"
221221

222222
[workspace.dependencies.bottlerocket-settings-plugin]
223223
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
@@ -226,7 +226,7 @@ version = "0.1.0"
226226

227227
[workspace.dependencies.settings-extension-oci-defaults]
228228
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
229-
tag = "bottlerocket-settings-models-v0.10.0"
229+
tag = "bottlerocket-settings-models-v0.11.0"
230230
version = "0.1.0"
231231

232232
[profile.release]

0 commit comments

Comments
 (0)