Update the kubeadm config API roundtrip yaml files

cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml

@@ -25,8 +25,20 @@ etcd:
     image: ""
 imageRepository: k8s.gcr.io
 kind: MasterConfiguration
-kubeProxy:
-  config:
+kubernetesVersion: v1.10.2
+networking:
+  dnsDomain: cluster.local
+  podSubnet: ""
+  serviceSubnet: 10.96.0.0/12
+nodeRegistration:
+  criSocket: /var/run/dockershim.sock
+  name: master-1
+  taints:
+  - effect: NoSchedule
+    key: node-role.kubernetes.io/master
+unifiedControlPlaneImage: ""
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
 bindAddress: 0.0.0.0
 clientConnection:
   acceptContentTypes: ""
@@ -58,6 +70,7 @@ kubeProxy:
   minSyncPeriod: 0s
   scheduler: ""
   syncPeriod: 30s
+kind: KubeProxyConfiguration
 metricsBindAddress: 127.0.0.1:10249
 mode: iptables
 nodePortAddresses: null
@@ -65,9 +78,9 @@ kubeProxy:
 portRange: ""
 resourceContainer: /kube-proxy
 udpIdleTimeout: 250ms
-kubeletConfiguration:
-  baseConfig:
+---
 address: 1.2.3.4
+apiVersion: kubelet.config.k8s.io/v1beta1
 authentication:
   anonymous:
     enabled: false
@@ -116,6 +129,7 @@ kubeletConfiguration:
 imageMinimumGCAge: 2m0s
 iptablesDropBit: 15
 iptablesMasqueradeBit: 14
+kind: KubeletConfiguration
 kubeAPIBurst: 10
 kubeAPIQPS: 5
 makeIPTablesUtilChains: true
@@ -135,15 +149,3 @@ kubeletConfiguration:
 streamingConnectionIdleTimeout: 4h0m0s
 syncFrequency: 1m0s
 volumeStatsAggPeriod: 1m0s
-kubernetesVersion: v1.10.2
-networking:
-  dnsDomain: cluster.local
-  podSubnet: ""
-  serviceSubnet: 10.96.0.0/12
-nodeRegistration:
-  criSocket: /var/run/dockershim.sock
-  name: master-1
-  taints:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-unifiedControlPlaneImage: ""

cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml

@@ -23,8 +23,20 @@ etcd:
     image: ""
 imageRepository: my-company.com
 kind: MasterConfiguration
-kubeProxy:
-  config:
+kubernetesVersion: v1.10.2
+networking:
+  dnsDomain: cluster.global
+  podSubnet: 10.148.0.0/16
+  serviceSubnet: 10.196.0.0/12
+nodeRegistration:
+  criSocket: /var/run/criruntime.sock
+  name: master-1
+  taints:
+  - effect: NoSchedule
+    key: node-role.kubernetes.io/master
+unifiedControlPlaneImage: ""
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
 bindAddress: 0.0.0.0
 clientConnection:
   acceptContentTypes: ""
@@ -32,7 +44,7 @@ kubeProxy:
   contentType: application/vnd.kubernetes.protobuf
   kubeconfig: /var/lib/kube-proxy/kubeconfig.conf
   qps: 5
-    clusterCIDR: ""
+clusterCIDR: 10.148.0.0/16
 configSyncPeriod: 15m0s
 conntrack:
   max: null
@@ -53,6 +65,7 @@ kubeProxy:
   minSyncPeriod: 0s
   scheduler: ""
   syncPeriod: 30s
+kind: KubeProxyConfiguration
 metricsBindAddress: 127.0.0.1:10249
 mode: ""
 nodePortAddresses: null
@@ -60,9 +73,9 @@ kubeProxy:
 portRange: ""
 resourceContainer: /kube-proxy
 udpIdleTimeout: 250ms
-kubeletConfiguration:
-  baseConfig:
+---
 address: 0.0.0.0
+apiVersion: kubelet.config.k8s.io/v1beta1
 authentication:
   anonymous:
     enabled: false
@@ -111,6 +124,7 @@ kubeletConfiguration:
 imageMinimumGCAge: 2m0s
 iptablesDropBit: 15
 iptablesMasqueradeBit: 14
+kind: KubeletConfiguration
 kubeAPIBurst: 10
 kubeAPIQPS: 5
 makeIPTablesUtilChains: true
@@ -130,15 +144,3 @@ kubeletConfiguration:
 streamingConnectionIdleTimeout: 4h0m0s
 syncFrequency: 1m0s
 volumeStatsAggPeriod: 1m0s
-kubernetesVersion: v1.10.2
-networking:
-  dnsDomain: cluster.global
-  podSubnet: ""
-  serviceSubnet: 10.196.0.0/12
-nodeRegistration:
-  criSocket: /var/run/criruntime.sock
-  name: master-1
-  taints:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-unifiedControlPlaneImage: ""

cmd/kubeadm/app/util/config/testdata/defaulting/master/incomplete.yaml

@@ -12,6 +12,7 @@ kubernetesVersion: v1.10.2
 networking:
   dnsDomain: cluster.global
   serviceSubnet: 10.196.0.0/12
+  podSubnet: 10.148.0.0/16
 nodeRegistration:
   criSocket: /var/run/criruntime.sock
   name: master-1