Don't support marshalling using the v1alpha1 version in kubeadm v1.11

cmd/kubeadm/app/util/config/masterconfig_test.go

@@ -39,8 +39,7 @@ const (
 	master_v1alpha2YAML                = "testdata/conversion/master/v1alpha2.yaml"
 	master_internalYAML                = "testdata/conversion/master/internal.yaml"
 	master_incompleteYAML              = "testdata/defaulting/master/incomplete.yaml"
-	master_defaultedv1alpha1YAML       = "testdata/defaulting/master/defaulted_v1alpha1.yaml"
-	master_defaultedv1alpha2YAML       = "testdata/defaulting/master/defaulted_v1alpha2.yaml"
+	master_defaultedYAML       = "testdata/defaulting/master/defaulted.yaml"
 	master_invalidYAML                 = "testdata/validation/invalid_mastercfg.yaml"
 	master_beforeUpgradeYAML           = "testdata/v1alpha1_upgrade/before.yaml"
 	master_afterUpgradeYAML            = "testdata/v1alpha1_upgrade/after.yaml"
@@ -79,12 +78,6 @@ func TestConfigFileAndDefaultsToInternalConfig(t *testing.T) {
 			out:          master_internalYAML,
 			groupVersion: kubeadm.SchemeGroupVersion,
 		},
-		{ // v1alpha1 (faulty) -> internal -> v1alpha1
-			name:         "v1alpha1WithoutTypeMetaTov1alpha1",
-			in:           master_v1alpha1WithoutTypeMetaYAML,
-			out:          master_v1alpha1YAML,
-			groupVersion: v1alpha1.SchemeGroupVersion,
-		},
 		{ // v1alpha2 -> internal
 			name:         "v1alpha2ToInternal",
 			in:           master_v1alpha2YAML,
@@ -105,16 +98,10 @@ func TestConfigFileAndDefaultsToInternalConfig(t *testing.T) {
 		},
 		// These tests are reading one file that has only a subset of the fields populated, loading it using ConfigFileAndDefaultsToInternalConfig,
 		// and then marshals the internal object to the expected groupVersion
-		{ // v1alpha1 (faulty) -> default -> validate -> internal -> v1alpha1
-			name:         "incompleteYAMLToDefaultedv1alpha1",
-			in:           master_incompleteYAML,
-			out:          master_defaultedv1alpha1YAML,
-			groupVersion: v1alpha1.SchemeGroupVersion,
-		},
 		{ // v1alpha1 (faulty) -> default -> validate -> internal -> v1alpha2
 			name:         "incompleteYAMLToDefaultedv1alpha2",
 			in:           master_incompleteYAML,
-			out:          master_defaultedv1alpha2YAML,
+			out:          master_defaultedYAML,
 			groupVersion: v1alpha2.SchemeGroupVersion,
 		},
 		{ // v1alpha1 (faulty) -> validation should fail

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

@@ -7,9 +7,6 @@ auditPolicy:
   logDir: /var/log/kubernetes/audit
   logMaxAge: 2
   path: ""
-authorizationModes:
-- Node
-- RBAC
 certificatesDir: /var/lib/kubernetes/pki
 clusterName: kubernetes
 criSocket: /var/run/criruntime.sock

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

-api:
-  advertiseAddress: 192.168.2.2
-  bindPort: 6443
-  controlPlaneEndpoint: ""
-apiVersion: kubeadm.k8s.io/v1alpha1
-auditPolicy:
-  logDir: /var/log/kubernetes/audit
-  logMaxAge: 2
-  path: ""
-authorizationModes:
-- Node
-- RBAC
-certificatesDir: /var/lib/kubernetes/pki
-cloudProvider: ""
-clusterName: kubernetes
-criSocket: /var/run/criruntime.sock
-etcd:
-  caFile: ""
-  certFile: ""
-  dataDir: /var/lib/etcd
-  endpoints: null
-  image: ""
-  keyFile: ""
-imageRepository: my-company.com
-kind: MasterConfiguration
-kubeProxy:
-  config:
-    bindAddress: 0.0.0.0
-    clientConnection:
-      acceptContentTypes: ""
-      burst: 10
-      contentType: application/vnd.kubernetes.protobuf
-      kubeconfig: /var/lib/kube-proxy/kubeconfig.conf
-      qps: 5
-    clusterCIDR: ""
-    configSyncPeriod: 15m0s
-    conntrack:
-      max: null
-      maxPerCore: 32768
-      min: 131072
-      tcpCloseWaitTimeout: 1h0m0s
-      tcpEstablishedTimeout: 24h0m0s
-    enableProfiling: false
-    healthzBindAddress: 0.0.0.0:10256
-    hostnameOverride: ""
-    iptables:
-      masqueradeAll: false
-      masqueradeBit: 14
-      minSyncPeriod: 0s
-      syncPeriod: 30s
-    ipvs:
-      ExcludeCIDRs: null
-      minSyncPeriod: 0s
-      scheduler: ""
-      syncPeriod: 30s
-    metricsBindAddress: 127.0.0.1:10249
-    mode: ""
-    nodePortAddresses: null
-    oomScoreAdj: -999
-    portRange: ""
-    resourceContainer: /kube-proxy
-    udpIdleTimeout: 250ms
-kubeletConfiguration: {}
-kubernetesVersion: v1.10.2
-networking:
-  dnsDomain: cluster.global
-  podSubnet: ""
-  serviceSubnet: 10.196.0.0/12
-nodeName: master-1
-privilegedPods: false
-token: s73ybu.6tw6wnqgp5z0wb77
-tokenGroups:
-- system:bootstrappers:kubeadm:default-node-token
-tokenTTL: 24h0m0s
-tokenUsages:
-- signing
-- authentication
-unifiedControlPlaneImage: ""