Merge pull request kubernetes#124496 from carlory/output-alpha3

kubeadm: remove the deprecated output.kubeadm.k8s.io/v1alpha2

Author: k8s-ci-robot

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

@@ -33,7 +33,6 @@ import (
 func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		fuzzBootstrapToken,
-		fuzzUpgradePlan,
 	}
 }
 
@@ -46,10 +45,3 @@ func fuzzBootstrapToken(obj *output.BootstrapToken, c fuzz.Continue) {
 	obj.Usages = []string{"authentication", "signing"}
 	obj.Groups = []string{constants.NodeBootstrapTokenAuthGroup}
 }
-
-// TODO: Remove this func when v1alpha2 is removed
-func fuzzUpgradePlan(obj *output.UpgradePlan, c fuzz.Continue) {
-	// Pin the value to avoid round tripping the AvailableUpgrades field
-	// which is not present in the v1alpha2 version.
-	obj.AvailableUpgrades = nil
-}

cmd/kubeadm/app/apis/output/scheme/scheme.go

@@ -24,7 +24,6 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/output"
-	"k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha2"
 	"k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha3"
 )
 
@@ -42,7 +41,6 @@ func init() {
 // AddToScheme builds the kubeadm scheme using all known versions of the kubeadm api.
 func AddToScheme(scheme *runtime.Scheme) {
 	utilruntime.Must(output.AddToScheme(scheme))
-	utilruntime.Must(v1alpha2.AddToScheme(scheme))
 	utilruntime.Must(v1alpha3.AddToScheme(scheme))
-	utilruntime.Must(scheme.SetVersionPriority(v1alpha3.SchemeGroupVersion, v1alpha2.SchemeGroupVersion))
+	utilruntime.Must(scheme.SetVersionPriority(v1alpha3.SchemeGroupVersion))
 }

cmd/kubeadm/app/apis/output/types.go

@@ -93,9 +93,6 @@ type UpgradePlan struct {
 	AvailableUpgrades []AvailableUpgrade
 
 	ConfigVersions []ComponentConfigVersionState
-
-	// TODO: Remove this field when v1alpha2 is removed
-	Components []ComponentUpgradePlan
 }
 
 // Certificate represents information for a certificate or a certificate authority when using the check-expiration command.