github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90730 from brianpursley/kubernetes-90726

Browse Source 
Fixed bug that caused TestKubeletDefault unit test to fail when run on systems that have systemd-resolved active
This commit is contained in:
Kubernetes Prow Robot 2020-05-04 12:16:41 -07:00 committed by GitHub
commit ffec75da81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kubeadm/app/componentconfigs/kubelet_test.go
View File

@ -155,6 +155,12 @@ func TestKubeletUnmarshal(t *testing.T) {
} }
func TestKubeletDefault(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 { tests := []struct {
name string name string
clusterCfg kubeadmapi.ClusterConfiguration clusterCfg kubeadmapi.ClusterConfiguration
@ -185,6 +191,7 @@ func TestKubeletDefault(t *testing.T) {
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig,
}, },
}, },
}, },
@ -217,6 +224,7 @@ func TestKubeletDefault(t *testing.T) {
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig,
}, },
}, },
}, },
@ -252,6 +260,7 @@ func TestKubeletDefault(t *testing.T) {
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig,
}, },
}, },
}, },
@ -285,6 +294,7 @@ func TestKubeletDefault(t *testing.T) {
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig,
}, },
}, },
}, },
@ -315,6 +325,7 @@ func TestKubeletDefault(t *testing.T) {
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig,
}, },
}, },
}, },
@ -325,7 +336,7 @@ func TestKubeletDefault(t *testing.T) {
got := &kubeletConfig{} got := &kubeletConfig{}
got.Default(&test.clusterCfg, &kubeadmapi.APIEndpoint{}, &kubeadmapi.NodeRegistrationOptions{}) got.Default(&test.clusterCfg, &kubeadmapi.APIEndpoint{}, &kubeadmapi.NodeRegistrationOptions{})
if !reflect.DeepEqual(got, &test.expected) { 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)
} }
}) })
} }