From bc77f4460994c1c2107d16767fa960277bc88aba Mon Sep 17 00:00:00 2001
From: Tianhao Geng <gthao313@gmail.com>
Date: Tue, 13 Apr 2021 00:27:36 +0000
Subject: [PATCH] kubelet: make cluster-dns-ip optional

Outside of EKS, we cannot compute a value for this, and there's not a
reasonable default. We also need to account for it being optional for
kubelet in standalone mode.
---
 packages/kubernetes-1.15/kubelet-config | 2 ++
 packages/kubernetes-1.16/kubelet-config | 2 ++
 packages/kubernetes-1.17/kubelet-config | 2 ++
 packages/kubernetes-1.18/kubelet-config | 2 ++
 packages/kubernetes-1.19/kubelet-config | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/packages/kubernetes-1.15/kubelet-config b/packages/kubernetes-1.15/kubelet-config
index 0a4c6364b95..eb9fe98668b 100644
--- a/packages/kubernetes-1.15/kubelet-config
+++ b/packages/kubernetes-1.15/kubelet-config
@@ -27,8 +27,10 @@ authorization:
     cacheUnauthorizedTTL: 30s
 {{~/if}}
 clusterDomain: {{settings.kubernetes.cluster-domain}}
+{{~#if settings.kubernetes.cluster-dns-ip}}
 clusterDNS:
 - {{settings.kubernetes.cluster-dns-ip}}
+{{~/if}}
 {{~#if settings.kubernetes.eviction-hard}}
 evictionHard:
   {{~#each settings.kubernetes.eviction-hard}}
diff --git a/packages/kubernetes-1.16/kubelet-config b/packages/kubernetes-1.16/kubelet-config
index 0a4c6364b95..eb9fe98668b 100644
--- a/packages/kubernetes-1.16/kubelet-config
+++ b/packages/kubernetes-1.16/kubelet-config
@@ -27,8 +27,10 @@ authorization:
     cacheUnauthorizedTTL: 30s
 {{~/if}}
 clusterDomain: {{settings.kubernetes.cluster-domain}}
+{{~#if settings.kubernetes.cluster-dns-ip}}
 clusterDNS:
 - {{settings.kubernetes.cluster-dns-ip}}
+{{~/if}}
 {{~#if settings.kubernetes.eviction-hard}}
 evictionHard:
   {{~#each settings.kubernetes.eviction-hard}}
diff --git a/packages/kubernetes-1.17/kubelet-config b/packages/kubernetes-1.17/kubelet-config
index 380b91e582b..27748838621 100644
--- a/packages/kubernetes-1.17/kubelet-config
+++ b/packages/kubernetes-1.17/kubelet-config
@@ -27,8 +27,10 @@ authorization:
     cacheUnauthorizedTTL: 30s
 {{~/if}}
 clusterDomain: {{settings.kubernetes.cluster-domain}}
+{{~#if settings.kubernetes.cluster-dns-ip}}
 clusterDNS:
 - {{settings.kubernetes.cluster-dns-ip}}
+{{~/if}}
 {{~#if settings.kubernetes.eviction-hard}}
 evictionHard:
   {{~#each settings.kubernetes.eviction-hard}}
diff --git a/packages/kubernetes-1.18/kubelet-config b/packages/kubernetes-1.18/kubelet-config
index 380b91e582b..27748838621 100644
--- a/packages/kubernetes-1.18/kubelet-config
+++ b/packages/kubernetes-1.18/kubelet-config
@@ -27,8 +27,10 @@ authorization:
     cacheUnauthorizedTTL: 30s
 {{~/if}}
 clusterDomain: {{settings.kubernetes.cluster-domain}}
+{{~#if settings.kubernetes.cluster-dns-ip}}
 clusterDNS:
 - {{settings.kubernetes.cluster-dns-ip}}
+{{~/if}}
 {{~#if settings.kubernetes.eviction-hard}}
 evictionHard:
   {{~#each settings.kubernetes.eviction-hard}}
diff --git a/packages/kubernetes-1.19/kubelet-config b/packages/kubernetes-1.19/kubelet-config
index abb2728384c..ca23586bc3b 100644
--- a/packages/kubernetes-1.19/kubelet-config
+++ b/packages/kubernetes-1.19/kubelet-config
@@ -27,8 +27,10 @@ authorization:
     cacheUnauthorizedTTL: 30s
 {{~/if}}
 clusterDomain: {{settings.kubernetes.cluster-domain}}
+{{~#if settings.kubernetes.cluster-dns-ip}}
 clusterDNS:
 - {{settings.kubernetes.cluster-dns-ip}}
+{{~/if}}
 {{~#if settings.kubernetes.eviction-hard}}
 evictionHard:
   {{~#each settings.kubernetes.eviction-hard}}