Merge pull request #12349 from sbueringer/pr-fix-conversion-verifier

🐛 Fix conversion-verifier and fix findings

Author: k8s-ci-robot

Makefile

@@ -718,7 +718,11 @@ verify-gen: generate  ## Verify go generated files are up to date
 
 .PHONY: verify-conversions
 verify-conversions: $(CONVERSION_VERIFIER)  ## Verifies expected API conversion are in place
-	$(CONVERSION_VERIFIER)
+	$(CONVERSION_VERIFIER) \
+		./api/... \
+		./internal/api/... \
+		./test/infrastructure/docker/api/... \
+		./test/infrastructure/docker/exp/api/...
 
 .PHONY: verify-doctoc
 verify-doctoc: generate-doctoc

api/core/v1beta1/conversion.go

@@ -167,6 +167,16 @@ func (dst *MachinePool) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
+func (src *MachineDrainRule) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*clusterv1.MachineDrainRule)
+	return Convert_v1beta1_MachineDrainRule_To_v1beta2_MachineDrainRule(src, dst, nil)
+}
+
+func (dst *MachineDrainRule) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*clusterv1.MachineDrainRule)
+	return Convert_v1beta2_MachineDrainRule_To_v1beta1_MachineDrainRule(src, dst, nil)
+}
+
 func Convert_v1beta2_ClusterClassSpec_To_v1beta1_ClusterClassSpec(in *clusterv1.ClusterClassSpec, out *ClusterClassSpec, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_ClusterClassSpec_To_v1beta1_ClusterClassSpec(in, out, s); err != nil {
 		return err

api/core/v1beta2/conversion.go

@@ -31,6 +31,7 @@ func (*MachineSet) Hub()         {}
 func (*MachineDeployment) Hub()  {}
 func (*MachineHealthCheck) Hub() {}
 func (*MachinePool) Hub()        {}
+func (*MachineDrainRule) Hub()   {}
 
 // ConvertToSeconds takes *metav1.Duration and returns a *int32.
 // Durations longer than MaxInt32 are capped.

hack/tools/conversion-verifier/main.go

@@ -19,8 +19,8 @@ package main
 import (
 	"fmt"
 	"go/types"
+	"os"
 	"path"
-	"strings"
 
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
@@ -88,10 +88,13 @@ func main() {
 	}
 
 	// Load all packages.
-	// TODO: Move the path parameter to a multi-string flag.
-	packages, err := loader.LoadRoots("./...")
-	if err != nil {
-		klog.Fatal(err)
+	var packages []*loader.Package
+	for _, pkgPath := range os.Args[1:] {
+		p, err := loader.LoadRoots(pkgPath)
+		if err != nil {
+			klog.Fatal(err)
+		}
+		packages = append(packages, p...)
 	}
 
 	// First loop through all the packages
@@ -137,33 +140,6 @@ func main() {
 		}
 	}
 
-	// Find and populate all <Kind>List types.
-	for _, pkg := range apiPackages {
-		if err := markers.EachType(col, pkg.Package, func(info *markers.TypeInfo) {
-			if !strings.HasSuffix(info.Name, "List") {
-				// We're only interested in List types in this iteration.
-				return
-			}
-			storage, ok := storageVersionTypes[path.Join(pkg.Group, strings.TrimSuffix(info.Name, "List"))]
-			if !ok || pkg.PkgPath != storage.pkg.PkgPath {
-				// Return early if the type isn't in the same storage package
-				// or if there is no storage version registered for this type.
-				return
-			}
-
-			// If we're here, we've found <Kind>List type that's also a storage version.
-			storageVersionTypes[path.Join(pkg.Group, info.Name)] = &storageVersionType{
-				versionType: &versionType{
-					pkg: pkg.Package,
-					typ: info,
-				},
-				otherDecls: make(map[string]*versionType),
-			}
-		}); err != nil {
-			klog.Fatal(err)
-		}
-	}
-
 	// Now that we have storage version information,
 	// loop through every package again and collect info about all declarations.
 	for _, pkg := range apiPackages {
@@ -215,6 +191,7 @@ func main() {
 		for _, err := range errs {
 			fmt.Printf("\t* %s\n", err)
 		}
+		os.Exit(1)
 	}
 }