Skip to content

Commit 58cdd43

Browse files
rpkellyrpkelly
committed
kubernetes: update kubelet config to use new static pods setting
Signed-off-by: Richard Kelly <[email protected]>
1 parent 0e969e5 commit 58cdd43

File tree

9 files changed

+87
-44
lines changed

9 files changed

+87
-44
lines changed

‎packages/kubernetes-1.28/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.29/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.30/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.31/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.32/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.33/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

‎packages/kubernetes-1.34/kubelet-config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[required-extensions]
22
kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] }
3-
std = { version = "v1", helpers = ["any_enabled", "default"] }
3+
std = { version = "v1", helpers = ["any_enabled", "if_not_null", "default"] }
44
+++
55
---
66
kind: KubeletConfiguration
@@ -154,7 +154,13 @@ tlsCipherSuites:
154154
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
155155
volumePluginDir: "/var/lib/kubelet/plugins/volume/exec"
156156
maxPods: {{default 110 settings.kubernetes.max-pods}}
157+
{{#if_not_null settings.kubernetes.static-pods-enabled}}
158+
{{#if settings.kubernetes.static-pods-enabled}}
157159
staticPodPath: "/etc/kubernetes/static-pods/"
160+
{{/if}}
161+
{{else}}
162+
staticPodPath: "/etc/kubernetes/static-pods/"
163+
{{/if_not_null}}
158164
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
159165
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
160166
{{/if}}

0 commit comments

Comments
 (0)