fix: respect machine policy id in kubernetes agent deployment target (#…

…807) * fix: respect machine policy id in kubernetes agent deployment target * fix: respect machine policy id in kubernetes agent worker
OctopusDeployLabs · Oct 30, 2024 · 794878b · 794878b
1 parent 146249b
commit 794878b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/octopusdeploy/schema_kubernetes_agent_deployment_target.go b/octopusdeploy/schema_kubernetes_agent_deployment_target.go
@@ -1,11 +1,12 @@
 package octopusdeploy
 
 import (
+	"net/url"
+
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/core"
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/machines"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"net/url"
 )
 
 func expandKubernetesAgentDeploymentTarget(kubernetesAgent *schema.ResourceData) *machines.DeploymentTarget {
@@ -30,6 +31,8 @@ func expandKubernetesAgentDeploymentTarget(kubernetesAgent *schema.ResourceData)
 	deploymentTarget.TenantTags = expandArray(kubernetesAgent.Get("tenant_tags").([]interface{}))
 	deploymentTarget.SpaceID = kubernetesAgent.Get("space_id").(string)
 
+	deploymentTarget.MachinePolicyID = kubernetesAgent.Get("machine_policy_id").(string)
+
 	return deploymentTarget
 }
 

diff --git a/octopusdeploy/schema_kubernetes_agent_worker.go b/octopusdeploy/schema_kubernetes_agent_worker.go
@@ -1,10 +1,11 @@
 package octopusdeploy
 
 import (
+	"net/url"
+
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/machines"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"net/url"
 )
 
 func expandKubernetesAgentWorker(kubernetesAgent *schema.ResourceData) *machines.Worker {
@@ -24,6 +25,8 @@ func expandKubernetesAgentWorker(kubernetesAgent *schema.ResourceData) *machines
 
 	Worker.SpaceID = kubernetesAgent.Get("space_id").(string)
 
+	Worker.MachinePolicyID = kubernetesAgent.Get("machine_policy_id").(string)
+
 	return Worker
 }