From 6b33a7706854cdbaba13d9c4f69e5d4aece9bdf4 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Wed, 18 Dec 2019 10:51:43 +0800 Subject: [PATCH] Adopt kubeadm and kubeproxy unit test after new config field added. Fix proxy unit test --- cmd/kubeadm/app/componentconfigs/kubeproxy_test.go | 2 ++ .../testdata/KubeProxyConfiguration/after/__internal.yaml | 1 + .../scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml | 1 + .../v1alpha1To__internal/empty.yaml.after_roundtrip | 1 + .../v1alpha1Tov1alpha1/empty.yaml.after_roundtrip | 1 + 5 files changed, 6 insertions(+) diff --git a/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go b/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go index a3ab50d7e0a..0fab5d768b4 100644 --- a/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go +++ b/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go @@ -83,6 +83,7 @@ var kubeProxyMarshalCases = []struct { nodePortAddresses: null oomScoreAdj: null portRange: "" + showHiddenMetricsForVersion: "" udpIdleTimeout: 0s winkernel: enableDSR: false @@ -134,6 +135,7 @@ var kubeProxyMarshalCases = []struct { nodePortAddresses: null oomScoreAdj: null portRange: "" + showHiddenMetricsForVersion: "" udpIdleTimeout: 0s winkernel: enableDSR: false diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/__internal.yaml b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/__internal.yaml index c20883b95ac..4f4c2e7a9eb 100755 --- a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/__internal.yaml +++ b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/__internal.yaml @@ -32,6 +32,7 @@ Mode: "" NodePortAddresses: null OOMScoreAdj: null PortRange: "" +ShowHiddenMetricsForVersion: "" UDPIdleTimeout: 0s Winkernel: EnableDSR: false diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml index 20a467ec023..657c44cee09 100755 --- a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml +++ b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml @@ -33,6 +33,7 @@ mode: "" nodePortAddresses: null oomScoreAdj: -999 portRange: "" +showHiddenMetricsForVersion: "" udpIdleTimeout: 250ms winkernel: enableDSR: false diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip index 341efcd3235..206a730dedd 100755 --- a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip +++ b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1To__internal/empty.yaml.after_roundtrip @@ -32,6 +32,7 @@ Mode: "" NodePortAddresses: null OOMScoreAdj: -999 PortRange: "" +ShowHiddenMetricsForVersion: "" UDPIdleTimeout: 250ms Winkernel: EnableDSR: false diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip index 20a467ec023..657c44cee09 100755 --- a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip +++ b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/v1alpha1Tov1alpha1/empty.yaml.after_roundtrip @@ -33,6 +33,7 @@ mode: "" nodePortAddresses: null oomScoreAdj: -999 portRange: "" +showHiddenMetricsForVersion: "" udpIdleTimeout: 250ms winkernel: enableDSR: false