diff --git a/packages/kubernetes-1.23/kubelet-exec-start-conf b/packages/kubernetes-1.23/kubelet-exec-start-conf index 6b901ceb8dc..607d1b798d6 100644 --- 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 index f1cc3a037f6..5b778020c6c 100644 --- 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 index f1cc3a037f6..5b778020c6c 100644 --- 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 index f1cc3a037f6..5b778020c6c 100644 --- 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}" \