Renamed deprecated ClusterClass Metadata field to DeprecatedV1Beta1Metadata

Signed-off-by: Stefan Büringer buringerst@vmware.com

Author: sbueringer

.golangci.yml

@@ -231,7 +231,7 @@ linters:
     # should be removed as the referenced deprecated item is removed from the project.
       - linters:
           - staticcheck
-        text: 'SA1019: (bootstrapv1.ClusterStatus|DockerMachine.Spec.Bootstrapped|machineStatus.Bootstrapped|dockerMachine.Spec.Backend.Docker.Bootstrapped|dockerMachine.Spec.Bootstrapped|devMachine.Spec.Backend.Docker.Bootstrapped|c.TopologyPlan|clusterv1.ClusterClassVariableMetadata|clusterv1beta1.ClusterClassVariableMetadata|(variable|currentDefinition|specVar|newVariableDefinition|statusVarDefinition).Metadata) is deprecated'
+        text: 'SA1019: (bootstrapv1.ClusterStatus|DockerMachine.Spec.Bootstrapped|machineStatus.Bootstrapped|dockerMachine.Spec.Backend.Docker.Bootstrapped|dockerMachine.Spec.Bootstrapped|devMachine.Spec.Backend.Docker.Bootstrapped|c.TopologyPlan|clusterv1.ClusterClassVariableMetadata|clusterv1beta1.ClusterClassVariableMetadata|(variable|currentDefinition|specVar|newVariableDefinition|statusVarDefinition|out).DeprecatedV1Beta1Metadata) is deprecated'
         # Deprecations for MD revision management
       - linters:
           - staticcheck

api/core/v1beta1/conversion.go

@@ -884,3 +884,31 @@ func Convert_v1beta1_MachinePoolStatus_To_v1beta2_MachinePoolStatus(in *MachineP
 func Convert_v1beta1_MachinePoolSpec_To_v1beta2_MachinePoolSpec(in *MachinePoolSpec, out *clusterv1.MachinePoolSpec, s apimachineryconversion.Scope) error {
 	return autoConvert_v1beta1_MachinePoolSpec_To_v1beta2_MachinePoolSpec(in, out, s)
 }
+
+func Convert_v1beta1_ClusterClassStatusVariableDefinition_To_v1beta2_ClusterClassStatusVariableDefinition(in *ClusterClassStatusVariableDefinition, out *clusterv1.ClusterClassStatusVariableDefinition, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_ClusterClassStatusVariableDefinition_To_v1beta2_ClusterClassStatusVariableDefinition(in, out, s); err != nil {
+		return err
+	}
+	return autoConvert_v1beta1_ClusterClassVariableMetadata_To_v1beta2_ClusterClassVariableMetadata(&in.Metadata, &out.DeprecatedV1Beta1Metadata, s)
+}
+
+func Convert_v1beta2_ClusterClassStatusVariableDefinition_To_v1beta1_ClusterClassStatusVariableDefinition(in *clusterv1.ClusterClassStatusVariableDefinition, out *ClusterClassStatusVariableDefinition, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ClusterClassStatusVariableDefinition_To_v1beta1_ClusterClassStatusVariableDefinition(in, out, s); err != nil {
+		return err
+	}
+	return autoConvert_v1beta2_ClusterClassVariableMetadata_To_v1beta1_ClusterClassVariableMetadata(&in.DeprecatedV1Beta1Metadata, &out.Metadata, s)
+}
+
+func Convert_v1beta1_ClusterClassVariable_To_v1beta2_ClusterClassVariable(in *ClusterClassVariable, out *clusterv1.ClusterClassVariable, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_ClusterClassVariable_To_v1beta2_ClusterClassVariable(in, out, s); err != nil {
+		return err
+	}
+	return autoConvert_v1beta1_ClusterClassVariableMetadata_To_v1beta2_ClusterClassVariableMetadata(&in.Metadata, &out.DeprecatedV1Beta1Metadata, s)
+}
+
+func Convert_v1beta2_ClusterClassVariable_To_v1beta1_ClusterClassVariable(in *clusterv1.ClusterClassVariable, out *ClusterClassVariable, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ClusterClassVariable_To_v1beta1_ClusterClassVariable(in, out, s); err != nil {
+		return err
+	}
+	return autoConvert_v1beta2_ClusterClassVariableMetadata_To_v1beta1_ClusterClassVariableMetadata(&in.DeprecatedV1Beta1Metadata, &out.Metadata, s)
+}

api/core/v1beta1/zz_generated.conversion.go

@@ -546,10 +546,10 @@ type ClusterClassVariable struct {
 	// It can be used to add additional data for higher level tools to
 	// a ClusterClassVariable.
 	//
-	// Deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please use XMetadata in JSONSchemaProps instead.
+	// Deprecated: This field is deprecated and will be removed when support for v1beta1 will be dropped. Please use XMetadata in JSONSchemaProps instead.
 	//
 	// +optional
-	Metadata ClusterClassVariableMetadata `json:"metadata,omitempty"`
+	DeprecatedV1Beta1Metadata ClusterClassVariableMetadata `json:"deprecatedV1Beta1Metadata,omitempty"`
 
 	// schema defines the schema of the variable.
 	// +required
@@ -1223,10 +1223,10 @@ type ClusterClassStatusVariableDefinition struct {
 	// It can be used to add additional data for higher level tools to
 	// a ClusterClassVariable.
 	//
-	// Deprecated: This field is deprecated and is going to be removed in the next apiVersion.
+	// Deprecated: This field is deprecated and will be removed when support for v1beta1 will be dropped. Please use XMetadata in JSONSchemaProps instead.
 	//
 	// +optional
-	Metadata ClusterClassVariableMetadata `json:"metadata,omitempty"`
+	DeprecatedV1Beta1Metadata ClusterClassVariableMetadata `json:"deprecatedV1Beta1Metadata,omitempty"`
 
 	// schema defines the schema of the variable.
 	// +required

api/core/v1beta2/clusterclass_types.go

@@ -166,6 +166,10 @@ proposal because most of the changes described below are a consequence of the wo
 - The `unhealthyConditions` field has been renamed to `unhealthyNodeConditions` in following struct:
   - `spec.controlPlane.machineHealthCheck`
   - `spec.workers.machineDeployments[].machineHealthCheck`
+- The `spec.variables[].metadata` and `.status.variables[].definitions[].metadata` fields have been renamed 
+  to `spec.variables[].deprecatedV1Beta1Metadata` and `.status.variables[].definitions[].deprecatedV1Beta1Metadata`
+  - These fields are deprecated and will be removed when support for v1beta1 will be dropped.
+  - Please use `XMetadata` in `JSONSchemaProps` instead.
 - The `builtin.cluster.classRef.Name` and `builtin.cluster.classRef.Namespace` variables have been added
   - The `builtin.cluster.class` and `builtin.cluster.classNamespace` are deprecated and will be removed with the next apiVersion. 
 - The `builtin.cluster.network.ipFamily` variable has been removed and it cannot be used anymore in patches

api/core/v1beta2/zz_generated.deepcopy.go

@@ -401,29 +401,29 @@ func addNewStatusVariable(variable clusterv1.ClusterClassVariable, from string)
 		DefinitionsConflict: false,
 		Definitions: []clusterv1.ClusterClassStatusVariableDefinition{
 			{
-				From:     from,
-				Required: variable.Required,
-				Metadata: variable.Metadata,
-				Schema:   variable.Schema,
+				From:                      from,
+				Required:                  variable.Required,
+				DeprecatedV1Beta1Metadata: variable.DeprecatedV1Beta1Metadata,
+				Schema:                    variable.Schema,
 			},
 		}}
 }
 
 func addDefinitionToExistingStatusVariable(variable clusterv1.ClusterClassVariable, from string, existingVariable *clusterv1.ClusterClassStatusVariable) *clusterv1.ClusterClassStatusVariable {
 	combinedVariable := existingVariable.DeepCopy()
 	newVariableDefinition := clusterv1.ClusterClassStatusVariableDefinition{
-		From:     from,
-		Required: variable.Required,
-		Metadata: variable.Metadata,
-		Schema:   variable.Schema,
+		From:                      from,
+		Required:                  variable.Required,
+		DeprecatedV1Beta1Metadata: variable.DeprecatedV1Beta1Metadata,
+		Schema:                    variable.Schema,
 	}
 	combinedVariable.Definitions = append(existingVariable.Definitions, newVariableDefinition)
 
 	// If the new definition is different from any existing definition, set DefinitionsConflict to true.
 	// If definitions already conflict, no need to check.
 	if !combinedVariable.DefinitionsConflict {
 		currentDefinition := combinedVariable.Definitions[0]
-		if currentDefinition.Required != newVariableDefinition.Required || !reflect.DeepEqual(currentDefinition.Schema, newVariableDefinition.Schema) || !reflect.DeepEqual(currentDefinition.Metadata, newVariableDefinition.Metadata) {
+		if currentDefinition.Required != newVariableDefinition.Required || !reflect.DeepEqual(currentDefinition.Schema, newVariableDefinition.Schema) || !reflect.DeepEqual(currentDefinition.DeprecatedV1Beta1Metadata, newVariableDefinition.DeprecatedV1Beta1Metadata) {
 			combinedVariable.DefinitionsConflict = true
 		}
 	}