Merge pull request #1073 from annablender/vm-affinity-harvester-backport-2.6

Add vm node affinity support for rancher 2.6

Author: Anna Blendermann

docs/resources/machine_config_v2.md

@@ -6,7 +6,7 @@ page_title: "rancher2_machine_config_v2 Resource"
 
 Provides a Rancher v2 Machine config v2 resource. This can be used to create Machine Config v2 for Rancher v2 and retrieve their information. This resource is available from Rancher v2.6.0 and above.
 
-`amazonec2`, `azure`, `digitalocean`, `linode`, `openstack`, and `vsphere` cloud providers are supported for machine config V2
+`amazonec2`, `azure`, `digitalocean`, `harvester`, `linode`, `openstack`, and `vsphere` cloud providers are supported for machine config V2
 
 **Note** This resource is used by 
 
@@ -196,6 +196,7 @@ The following attributes are exported:
 * `network_model` - (Optional) Network model, Default `virtio` (string)
 * `user_data` - (Optional) UserData content of cloud-init, base64 is supported (string)
 * `network_data` - (Optional) NetworkData content of cloud-init, base64 is supported (string)
+* `vm_affinity` - (Optional) Virtual machine affinity, base64 is supported. For Rancher v2.6.7 or above (string)
 
 ### `linode_config`
 

docs/resources/node_template.md

@@ -264,6 +264,7 @@ The following attributes are exported:
 * `network_model` - (Optional) Network model, Default `virtio` (string)
 * `user_data` - (Optional) UserData content of cloud-init, base64 is supported (string)
 * `network_data` - (Optional) NetworkData content of cloud-init, base64 is supported (string)
+* `vm_affinity` - (Optional) Virtual machine affinity, base64 is supported. For Rancher v2.6.7 or above (string)
 
 ### `hetzner_config`
 

rancher2/schema_machine_config_v2_harvester.go

@@ -14,6 +14,11 @@ func machineConfigV2HarvesterFields() map[string]*schema.Schema {
 			Required:    true,
 			Description: "Virtual machine namespace",
 		},
+		"vm_affinity": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "VM affinity, base64 is supported",
+		},
 		"cpu_count": {
 			Type:        schema.TypeString,
 			Optional:    true,

rancher2/schema_node_template_harvester.go

@@ -24,6 +24,7 @@ const (
 
 type harvesterConfig struct {
 	VMNamespace  string `json:"vmNamespace,omitempty" yaml:"vmNamespace,omitempty"`
+	VMAffinity   string `json:"vmAffinity,omitempty" yaml:"vmAffinity,omitempty"`
 	CPUCount     string `json:"cpuCount,omitempty" yaml:"cpuCount,omitempty"`
 	MemorySize   string `json:"memorySize,omitempty" yaml:"memorySize,omitempty"`
 	DiskSize     string `json:"diskSize,omitempty" yaml:"diskSize,omitempty"`
@@ -46,6 +47,11 @@ func harvesterConfigFields() map[string]*schema.Schema {
 			Required:    true,
 			Description: "Virtual machine namespace",
 		},
+		"vm_affinity": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "VM affinity, base64 is supported",
+		},
 		"cpu_count": {
 			Type:        schema.TypeString,
 			Optional:    true,

rancher2/structure_machine_config_v2_harvester.go

@@ -18,6 +18,7 @@ type machineConfigV2Harvester struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 	VMNamespace       string `json:"vmNamespace,omitempty" yaml:"vmNamespace,omitempty"`
+	VMAffinity        string `json:"vmAffinity,omitempty" yaml:"vmAffinity,omitempty"`
 	CPUCount          string `json:"cpuCount,omitempty" yaml:"cpuCount,omitempty"`
 	MemorySize        string `json:"memorySize,omitempty" yaml:"memorySize,omitempty"`
 	DiskSize          string `json:"diskSize,omitempty" yaml:"diskSize,omitempty"`
@@ -49,6 +50,10 @@ func flattenMachineConfigV2Harvester(in *MachineConfigV2Harvester) []interface{}
 		obj["vm_namespace"] = in.VMNamespace
 	}
 
+	if len(in.VMAffinity) > 0 {
+		obj["vm_affinity"] = in.VMAffinity
+	}
+
 	if len(in.CPUCount) > 0 {
 		obj["cpu_count"] = in.CPUCount
 	}
@@ -118,6 +123,10 @@ func expandMachineConfigV2Harvester(p []interface{}, source *MachineConfigV2) *M
 		obj.VMNamespace = v
 	}
 
+	if v, ok := in["vm_affinity"].(string); ok && len(v) > 0 {
+		obj.VMAffinity = v
+	}
+
 	if v, ok := in["cpu_count"].(string); ok && len(v) > 0 {
 		obj.CPUCount = v
 	}

rancher2/structure_node_template_harvester.go

@@ -12,6 +12,10 @@ func flattenHarvesterConfig(in *harvesterConfig) []interface{} {
 		obj["vm_namespace"] = in.VMNamespace
 	}
 
+	if len(in.VMAffinity) > 0 {
+		obj["vm_affinity"] = in.VMAffinity
+	}
+
 	if len(in.CPUCount) > 0 {
 		obj["cpu_count"] = in.CPUCount
 	}
@@ -72,6 +76,10 @@ func expandHarvestercloudConfig(p []interface{}) *harvesterConfig {
 		obj.VMNamespace = v
 	}
 
+	if v, ok := in["vm_affinity"].(string); ok && len(v) > 0 {
+		obj.VMAffinity = v
+	}
+
 	if v, ok := in["cpu_count"].(string); ok && len(v) > 0 {
 		obj.CPUCount = v
 	}