Update unit tests

cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go

@@ -25,8 +25,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
+	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
+	kubeletconfigscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme"
 	kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
-	kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
+	"k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig"
 	utilpointer "k8s.io/kubernetes/pkg/util/pointer"
 )
 
@@ -81,60 +83,59 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
 				Name:      "foo",
 				Taints:    []v1.Taint{},
 			}
-			obj.KubeletConfiguration = kubeadm.KubeletConfiguration{
-				BaseConfig: &kubeletconfigv1beta1.KubeletConfiguration{
-					StaticPodPath: "foo",
-					ClusterDNS:    []string{"foo"},
-					ClusterDomain: "foo",
-					Authorization: kubeletconfigv1beta1.KubeletAuthorization{
-						Mode: "Webhook",
+			extkubeletconfig := &kubeletconfigv1beta1.KubeletConfiguration{
+				StaticPodPath: "foo",
+				ClusterDNS:    []string{"foo"},
+				ClusterDomain: "foo",
+				Authorization: kubeletconfigv1beta1.KubeletAuthorization{
+					Mode: "Webhook",
+				},
+				Authentication: kubeletconfigv1beta1.KubeletAuthentication{
+					X509: kubeletconfigv1beta1.KubeletX509Authentication{
+						ClientCAFile: "/etc/kubernetes/pki/ca.crt",
 					},
-					Authentication: kubeletconfigv1beta1.KubeletAuthentication{
-						X509: kubeletconfigv1beta1.KubeletX509Authentication{
-							ClientCAFile: "/etc/kubernetes/pki/ca.crt",
-						},
-						Anonymous: kubeletconfigv1beta1.KubeletAnonymousAuthentication{
-							Enabled: utilpointer.BoolPtr(false),
-						},
+					Anonymous: kubeletconfigv1beta1.KubeletAnonymousAuthentication{
+						Enabled: utilpointer.BoolPtr(false),
 					},
-					RotateCertificates: true,
 				},
+				RotateCertificates: true,
 			}
-			kubeletconfigv1beta1.SetDefaults_KubeletConfiguration(obj.KubeletConfiguration.BaseConfig)
-			obj.KubeProxy = kubeadm.KubeProxy{
-				Config: &kubeproxyconfigv1alpha1.KubeProxyConfiguration{
-					FeatureGates:       map[string]bool{"foo": true},
-					BindAddress:        "foo",
-					HealthzBindAddress: "foo:10256",
-					MetricsBindAddress: "foo:",
-					EnableProfiling:    bool(true),
-					ClusterCIDR:        "foo",
-					HostnameOverride:   "foo",
-					ClientConnection: kubeproxyconfigv1alpha1.ClientConnectionConfiguration{
-						KubeConfigFile:     "foo",
-						AcceptContentTypes: "foo",
-						ContentType:        "foo",
-						QPS:                float32(5),
-						Burst:              10,
-					},
-					IPVS: kubeproxyconfigv1alpha1.KubeProxyIPVSConfiguration{
-						SyncPeriod: metav1.Duration{Duration: 1},
-					},
-					IPTables: kubeproxyconfigv1alpha1.KubeProxyIPTablesConfiguration{
-						MasqueradeBit: utilpointer.Int32Ptr(0),
-						SyncPeriod:    metav1.Duration{Duration: 1},
-					},
-					OOMScoreAdj:       utilpointer.Int32Ptr(0),
-					ResourceContainer: "foo",
-					UDPIdleTimeout:    metav1.Duration{Duration: 1},
-					Conntrack: kubeproxyconfigv1alpha1.KubeProxyConntrackConfiguration{
-						MaxPerCore: utilpointer.Int32Ptr(2),
-						Min:        utilpointer.Int32Ptr(1),
-						TCPEstablishedTimeout: &metav1.Duration{Duration: 5},
-						TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5},
-					},
-					ConfigSyncPeriod: metav1.Duration{Duration: 1},
+			obj.ComponentConfigs.Kubelet = &kubeletconfig.KubeletConfiguration{}
+			kubeletconfigv1beta1.SetDefaults_KubeletConfiguration(extkubeletconfig)
+			scheme, _, _ := kubeletconfigscheme.NewSchemeAndCodecs()
+			scheme.Convert(extkubeletconfig, obj.ComponentConfigs.Kubelet, nil)
+			obj.ComponentConfigs.KubeProxy = &kubeproxyconfig.KubeProxyConfiguration{
+				FeatureGates:       map[string]bool{"foo": true},
+				BindAddress:        "foo",
+				HealthzBindAddress: "foo:10256",
+				MetricsBindAddress: "foo:",
+				EnableProfiling:    bool(true),
+				ClusterCIDR:        "foo",
+				HostnameOverride:   "foo",
+				ClientConnection: kubeproxyconfig.ClientConnectionConfiguration{
+					KubeConfigFile:     "foo",
+					AcceptContentTypes: "foo",
+					ContentType:        "foo",
+					QPS:                float32(5),
+					Burst:              10,
+				},
+				IPVS: kubeproxyconfig.KubeProxyIPVSConfiguration{
+					SyncPeriod: metav1.Duration{Duration: 1},
+				},
+				IPTables: kubeproxyconfig.KubeProxyIPTablesConfiguration{
+					MasqueradeBit: utilpointer.Int32Ptr(0),
+					SyncPeriod:    metav1.Duration{Duration: 1},
+				},
+				OOMScoreAdj:       utilpointer.Int32Ptr(0),
+				ResourceContainer: "foo",
+				UDPIdleTimeout:    metav1.Duration{Duration: 1},
+				Conntrack: kubeproxyconfig.KubeProxyConntrackConfiguration{
+					MaxPerCore: utilpointer.Int32Ptr(2),
+					Min:        utilpointer.Int32Ptr(1),
+					TCPEstablishedTimeout: &metav1.Duration{Duration: 5},
+					TCPCloseWaitTimeout:   &metav1.Duration{Duration: 5},
 				},
+				ConfigSyncPeriod: metav1.Duration{Duration: 1},
 			}
 			obj.AuditPolicyConfiguration = kubeadm.AuditPolicyConfiguration{
 				Path:      "foo",

cmd/kubeadm/app/phases/addons/proxy/proxy_test.go

@@ -238,17 +238,17 @@ func TestEnsureProxyAddon(t *testing.T) {
 				expErr,
 				actErr)
 		}
-		if intMaster.KubeProxy.Config.BindAddress != tc.expBindAddr {
+		if intMaster.ComponentConfigs.KubeProxy.BindAddress != tc.expBindAddr {
 			t.Errorf("%s test failed, expected: %s, got: %s",
 				tc.name,
 				tc.expBindAddr,
-				intMaster.KubeProxy.Config.BindAddress)
+				intMaster.ComponentConfigs.KubeProxy.BindAddress)
 		}
-		if intMaster.KubeProxy.Config.ClusterCIDR != tc.expClusterCIDR {
+		if intMaster.ComponentConfigs.KubeProxy.ClusterCIDR != tc.expClusterCIDR {
 			t.Errorf("%s test failed, expected: %s, got: %s",
 				tc.name,
 				tc.expClusterCIDR,
-				intMaster.KubeProxy.Config.ClusterCIDR)
+				intMaster.ComponentConfigs.KubeProxy.ClusterCIDR)
 		}
 	}
 }

cmd/kubeadm/app/phases/kubelet/config_test.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
-	kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
+	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
 	"k8s.io/kubernetes/pkg/util/version"
 )
 
@@ -35,8 +35,8 @@ func TestCreateConfigMap(t *testing.T) {
 	cfg := &kubeadmapi.MasterConfiguration{
 		NodeRegistration:  kubeadmapi.NodeRegistrationOptions{Name: nodeName},
 		KubernetesVersion: "v1.11.0",
-		KubeletConfiguration: kubeadmapi.KubeletConfiguration{
-			BaseConfig: &kubeletconfigv1beta1.KubeletConfiguration{},
+		ComponentConfigs: kubeadmapi.ComponentConfigs{
+			Kubelet: &kubeletconfig.KubeletConfiguration{},
 		},
 	}