Merge pull request #5360 from sbueringer/pr-fix-capd-conversion

k8s-ci-robot · web-flow · commit 6d1f69218935 · 2021-09-30T04:14:07.000-07:00
🐛 Fix CAPD v1alpha3=&gt;v1beta1 conversion
diff --git a/test/infrastructure/docker/api/v1alpha3/conversion.go b/test/infrastructure/docker/api/v1alpha3/conversion.go
@@ -18,7 +18,6 @@ package v1alpha3
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
-	"sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4"
 	"sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -32,7 +31,7 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	// Manually restore data.
-	restored := &v1alpha4.DockerCluster{}
+	restored := &v1beta1.DockerCluster{}
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ package v1alpha3`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`apiconversion "k8s.io/apimachinery/pkg/conversion"`
`21`		`- "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4"`
`22`	`21`	`"sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"`
`23`	`22`	`utilconversion "sigs.k8s.io/cluster-api/util/conversion"`
`24`	`23`	`"sigs.k8s.io/controller-runtime/pkg/conversion"`
`@@ -32,7 +31,7 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`// Manually restore data.`
`35`		`- restored := &v1alpha4.DockerCluster{}`
	`34`	`+ restored := &v1beta1.DockerCluster{}`
`36`	`35`	`if ok, err := utilconversion.UnmarshalData(src, restored); err != nil \|\| !ok {`
`37`	`36`	`return err`
`38`	`37`	`}`