From f8cd4a06efc0147dc46982d2db80440afc31ea0a Mon Sep 17 00:00:00 2001
From: Brian Pursley <bpursley@cinlogic.com>
Date: Mon, 4 May 2020 11:55:54 -0400
Subject: [PATCH] Fixed bug that caused TestKubeletDefault to fail when run on
 systems that have systemd-resolved active

---
 cmd/kubeadm/app/componentconfigs/kubelet_test.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_test.go
index 049b3c5a09a..a8aab9a14da 100644
--- a/cmd/kubeadm/app/componentconfigs/kubelet_test.go
+++ b/cmd/kubeadm/app/componentconfigs/kubelet_test.go
@@ -155,6 +155,12 @@ func TestKubeletUnmarshal(t *testing.T) {
 }
 
 func TestKubeletDefault(t *testing.T) {
+	var resolverConfig string
+	if isSystemdResolvedActive, _ := isServiceActive("systemd-resolved"); isSystemdResolvedActive {
+		// If systemd-resolved is active, we need to set the default resolver config
+		resolverConfig = kubeletSystemdResolverConfig
+	}
+
 	tests := []struct {
 		name       string
 		clusterCfg kubeadmapi.ClusterConfiguration
@@ -185,6 +191,7 @@ func TestKubeletDefault(t *testing.T) {
 					HealthzBindAddress: kubeletHealthzBindAddress,
 					HealthzPort:        utilpointer.Int32Ptr(constants.KubeletHealthzPort),
 					RotateCertificates: kubeletRotateCertificates,
+					ResolverConfig:     resolverConfig,
 				},
 			},
 		},
@@ -217,6 +224,7 @@ func TestKubeletDefault(t *testing.T) {
 					HealthzBindAddress: kubeletHealthzBindAddress,
 					HealthzPort:        utilpointer.Int32Ptr(constants.KubeletHealthzPort),
 					RotateCertificates: kubeletRotateCertificates,
+					ResolverConfig:     resolverConfig,
 				},
 			},
 		},
@@ -252,6 +260,7 @@ func TestKubeletDefault(t *testing.T) {
 					HealthzBindAddress: kubeletHealthzBindAddress,
 					HealthzPort:        utilpointer.Int32Ptr(constants.KubeletHealthzPort),
 					RotateCertificates: kubeletRotateCertificates,
+					ResolverConfig:     resolverConfig,
 				},
 			},
 		},
@@ -285,6 +294,7 @@ func TestKubeletDefault(t *testing.T) {
 					HealthzBindAddress: kubeletHealthzBindAddress,
 					HealthzPort:        utilpointer.Int32Ptr(constants.KubeletHealthzPort),
 					RotateCertificates: kubeletRotateCertificates,
+					ResolverConfig:     resolverConfig,
 				},
 			},
 		},
@@ -315,6 +325,7 @@ func TestKubeletDefault(t *testing.T) {
 					HealthzBindAddress: kubeletHealthzBindAddress,
 					HealthzPort:        utilpointer.Int32Ptr(constants.KubeletHealthzPort),
 					RotateCertificates: kubeletRotateCertificates,
+					ResolverConfig:     resolverConfig,
 				},
 			},
 		},
@@ -325,7 +336,7 @@ func TestKubeletDefault(t *testing.T) {
 			got := &kubeletConfig{}
 			got.Default(&test.clusterCfg, &kubeadmapi.APIEndpoint{}, &kubeadmapi.NodeRegistrationOptions{})
 			if !reflect.DeepEqual(got, &test.expected) {
-				t.Fatalf("Missmatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", test.expected, got)
+				t.Fatalf("Missmatch between expected and got:\nExpected:\n%v\n---\nGot:\n%v", test.expected, *got)
 			}
 		})
 	}