Updates controller-runtime version to v0.8.1

This involved bumping the code-gen version to 0.20 because the signature
of the function had been updated. Required regenerating the conversion
code.
Also updated the types containing slice of pointers of custom object
types to slice of custom objects to avoid conversion errors.
Update the v1a3 -> v1a4 upgrade docs to record this requirement.

Signed-off-by: Sagar Muchhal <[email protected]>

Author: srm09

Makefile

@@ -234,9 +234,13 @@ generate-go-core: $(CONTROLLER_GEN) $(CONVERSION_GEN)
 	$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha3,./$(EXP_DIR)/api/v1alpha3,./$(EXP_DIR)/addons/api/v1alpha3"
 	$(CONVERSION_GEN) \
 		--input-dirs=./api/v1alpha3 \
+		--build-tag=ignore_autogenerated_core_v1alpha3 \
+		--output-file-base=zz_generated.conversion \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+	$(CONVERSION_GEN) \
 		--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
 		--input-dirs=./$(EXP_DIR)/addons/api/v1alpha3 \
-		--build-tag=ignore_autogenerated_core_v1alpha3 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 

cmd/clusterctl/client/cluster/inventory_managementgroup_test.go

@@ -171,8 +171,9 @@ func fakeProvider(name string, providerType clusterctlv1.ProviderType, version,
 			Kind:       "Provider",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: targetNamespace,
-			Name:      clusterctlv1.ManifestLabel(name, providerType),
+			ResourceVersion: "1",
+			Namespace:       targetNamespace,
+			Name:            clusterctlv1.ManifestLabel(name, providerType),
 			Labels: map[string]string{
 				clusterctlv1.ClusterctlLabelName:     "",
 				clusterv1.ProviderLabelName:          clusterctlv1.ManifestLabel(name, providerType),

cmd/clusterctl/client/cluster/inventory_test.go

@@ -77,7 +77,7 @@ func Test_inventoryClient_EnsureCustomResourceDefinitions(t *testing.T) {
 	}
 }
 
-var fooProvider = clusterctlv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "ns1"}}
+var fooProvider = clusterctlv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "ns1", ResourceVersion: "1"}}
 
 func Test_inventoryClient_List(t *testing.T) {
 	type fields struct {
@@ -127,6 +127,8 @@ func Test_inventoryClient_Create(t *testing.T) {
 		m clusterctlv1.Provider
 	}
 	providerV2 := fakeProvider("infra", clusterctlv1.InfrastructureProviderType, "v0.2.0", "", "")
+	// since this test object is used in a Create request, wherein setting ResourceVersion should no be set
+	providerV2.ResourceVersion = ""
 	providerV3 := fakeProvider("infra", clusterctlv1.InfrastructureProviderType, "v0.3.0", "", "")
 
 	tests := []struct {

cmd/clusterctl/internal/test/fake_proxy.go

@@ -149,8 +149,9 @@ func (f *FakeProxy) WithProviderInventory(name string, providerType clusterctlv1
 			Kind:       "Provider",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: targetNamespace,
-			Name:      clusterctlv1.ManifestLabel(name, providerType),
+			ResourceVersion: "1",
+			Namespace:       targetNamespace,
+			Name:            clusterctlv1.ManifestLabel(name, providerType),
 			Labels: map[string]string{
 				clusterctlv1.ClusterctlLabelName:     "",
 				clusterv1.ProviderLabelName:          clusterctlv1.ManifestLabel(name, providerType),

controllers/external/util_test.go

@@ -44,12 +44,14 @@ func TestGetResourceFound(t *testing.T) {
 	testResourceName := "greenTemplate"
 	testResourceKind := "GreenTemplate"
 	testResourceAPIVersion := "green.io/v1"
+	testResourceVersion := "1"
 
 	testResource := &unstructured.Unstructured{}
 	testResource.SetKind(testResourceKind)
 	testResource.SetAPIVersion(testResourceAPIVersion)
 	testResource.SetName(testResourceName)
 	testResource.SetNamespace(namespace)
+	testResource.SetResourceVersion(testResourceVersion)
 
 	testResourceReference := &corev1.ObjectReference{
 		Kind:       testResourceKind,

docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md

@@ -54,3 +54,7 @@ see [Multi-tenancy](../architecture/controllers/multi-tenancy.md) and [Support m
 more details.
 
 Specific changes related to this topic will be detailed in this document.
+
+## Change types with arrays of pointers to custom objects
+
+The conversion-gen code from the `1.20.x` release onward generates incorrect conversion functions for types having arrays of pointers to custom objects. Change the existing types to contain objects instead of pointer references.