Merge pull request #1903 from shiftstack/issue_1882

🐛 Remove `IdentityRef.Kind`

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -624,3 +624,7 @@ func Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *Security
 
 	return nil
 }
+
+func Convert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *infrav1.OpenStackIdentityReference, s conversion.Scope) error {
+	return autoConvert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s)
+}

api/v1alpha5/zz_generated.conversion.go

@@ -73,6 +73,9 @@ func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa
 			dst.ServerMetadata[k] = v
 		}
 	}
+
+	// Conversion to v1alpha8 removes the Kind fild
+	dst.IdentityRef = previous.IdentityRef
 }
 
 func restorev1alpha6ClusterStatus(previous *OpenStackClusterStatus, dst *OpenStackClusterStatus) {
@@ -162,6 +165,9 @@ func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 	if previous.AllowAllInClusterTraffic && !previous.ManagedSecurityGroups {
 		dst.AllowAllInClusterTraffic = true
 	}
+
+	// Conversion to v1alpha8 removes the Kind field
+	dst.IdentityRef = previous.IdentityRef
 }
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
@@ -988,3 +994,7 @@ func Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *Security
 
 	return nil
 }
+
+func Convert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *infrav1.OpenStackIdentityReference, s apiconversion.Scope) error {
+	return autoConvert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s)
+}

api/v1alpha6/conversion.go

@@ -180,6 +180,9 @@ func restorev1alpha7MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa
 			dst.ServerMetadata[k] = v
 		}
 	}
+
+	// Conversion to v1alpha8 removes the Kind field
+	dst.IdentityRef = previous.IdentityRef
 }
 
 func restorev1alpha8MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infrav1.OpenStackMachineSpec) {
@@ -210,6 +213,9 @@ func restorev1alpha7ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 	if previous.AllowAllInClusterTraffic && !previous.ManagedSecurityGroups {
 		dst.AllowAllInClusterTraffic = true
 	}
+
+	// Conversion to v1alpha8 removes the Kind field
+	dst.IdentityRef = previous.IdentityRef
 }
 
 func restorev1alpha8ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
@@ -678,3 +684,7 @@ func Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *Security
 
 	return nil
 }
+
+func Convert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *infrav1.OpenStackIdentityReference, s apiconversion.Scope) error {
+	return autoConvert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s)
+}