Merge pull request #8031 from killianmuldoon/pr-exvars-cluster-variable-definition

 🌱 Add DefinitionFrom field to ClusterVariable

Author: k8s-ci-robot

api/v1beta1/cluster_types.go

@@ -234,13 +234,19 @@ type MachineHealthCheckTopology struct {
 	MachineHealthCheckClass `json:",inline"`
 }
 
-// ClusterVariable can be used to customize the Cluster through
-// patches. It must comply to the corresponding
-// ClusterClassVariable defined in the ClusterClass.
+// ClusterVariable can be used to customize the Cluster through patches. Each ClusterVariable is associated with a
+// Variable definition in the ClusterClass `status` variables.
 type ClusterVariable struct {
 	// Name of the variable.
 	Name string `json:"name"`
 
+	// DefinitionFrom specifies where the definition of this Variable is from. DefinitionFrom is `inline` when the
+	// definition is from the ClusterClass `.spec.variables` or the name of a patch defined in the ClusterClass
+	// `.spec.patches` where the patch is external and provides external variables.
+	// This field is mandatory if the variable has `DefinitionsConflict: true` in ClusterClass `status.variables[]`
+	// +optional
+	DefinitionFrom string `json:"definitionFrom,omitempty"`
+
 	// Value of the variable.
 	// Note: the value will be validated against the schema of the corresponding ClusterClassVariable
 	// from the ClusterClass.