kubelet: don't specify hostname-override if cloudprovider is set to aws

This is only applicable to <1.27 kubelet since 1.27 removes the aws in-tree cloud provider.
bottlerocket-os · Nov 8, 2023 · c6ae2a0 · c6ae2a0
1 parent dbf9ed1
commit c6ae2a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/packages/kubernetes-1.23/kubelet-exec-start-conf b/packages/kubernetes-1.23/kubelet-exec-start-conf
@@ -27,9 +27,11 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
 {{/if}}
+{{#unless (eq settings.kubernetes.cloud-provider "aws")}}
 {{#if settings.kubernetes.hostname-override}}
     --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
+{{/unless}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \
     --register-with-taints "${NODE_TAINTS}" \

diff --git a/packages/kubernetes-1.24/kubelet-exec-start-conf b/packages/kubernetes-1.24/kubelet-exec-start-conf
@@ -26,9 +26,11 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
 {{/if}}
+{{#unless (eq settings.kubernetes.cloud-provider "aws")}}
 {{#if settings.kubernetes.hostname-override}}
     --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
+{{/unless}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \
     --register-with-taints "${NODE_TAINTS}" \

diff --git a/packages/kubernetes-1.25/kubelet-exec-start-conf b/packages/kubernetes-1.25/kubelet-exec-start-conf
@@ -26,9 +26,11 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
 {{/if}}
+{{#unless (eq settings.kubernetes.cloud-provider "aws")}}
 {{#if settings.kubernetes.hostname-override}}
     --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
+{{/unless}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \
     --register-with-taints "${NODE_TAINTS}" \

diff --git a/packages/kubernetes-1.26/kubelet-exec-start-conf b/packages/kubernetes-1.26/kubelet-exec-start-conf
@@ -26,9 +26,11 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
 {{/if}}
+{{#unless (eq settings.kubernetes.cloud-provider "aws")}}
 {{#if settings.kubernetes.hostname-override}}
     --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
+{{/unless}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \
     --register-with-taints "${NODE_TAINTS}" \