Fix deployment file create for kube deployment (#1454)

* fix dpeloyment file create for kube deployment * undo comment * undelete file * fix test * fix test
astronomer · Nov 28, 2023 · 7d5337e · 7d5337e
1 parent 18d0c75
commit 7d5337e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/cloud/deployment/fromfile/fromfile.go b/cloud/deployment/fromfile/fromfile.go
@@ -551,7 +551,10 @@ func getQueues(deploymentFromFile *inspect.FormattedDeployment, nodePools []astr
 		qList[i].IsDefault = requestedQueues[i].Name == defaultQueue
 		if requestedQueues[i].MinWorkerCount != nil {
 			qList[i].MinWorkerCount = *requestedQueues[i].MinWorkerCount
+		} else {
+			qList[i].MinWorkerCount = -1
 		}
+
 		qList[i].MaxWorkerCount = requestedQueues[i].MaxWorkerCount
 		qList[i].WorkerConcurrency = requestedQueues[i].WorkerConcurrency
 		qList[i].WorkerConcurrency = requestedQueues[i].WorkerConcurrency

diff --git a/cloud/deployment/fromfile/fromfile_test.go b/cloud/deployment/fromfile/fromfile_test.go
@@ -4433,11 +4433,12 @@ func TestGetQueues(t *testing.T) {
 			}
 			expectedWQList := []astro.WorkerQueue{
 				{
-					Name:       "default",
-					IsDefault:  true,
-					PodCPU:     "0.1",
-					PodRAM:     "0.25Gi",
-					NodePoolID: "test-pool-id",
+					Name:           "default",
+					IsDefault:      true,
+					PodCPU:         "0.1",
+					PodRAM:         "0.25Gi",
+					MinWorkerCount: -1,
+					NodePoolID:     "test-pool-id",
 				},
 			}
 			qList := []inspect.Workerq{

diff --git a/cloud/deployment/inspect/inspect.go b/cloud/deployment/inspect/inspect.go
@@ -401,7 +401,15 @@ func getTemplate(formattedDeployment *FormattedDeployment) FormattedDeployment {
 	}
 	template.Deployment.EnvVars = newEnvVars
 	if template.Deployment.Configuration.Executor == deployment.KubeExecutor {
-		template.Deployment.WorkerQs = nil
+		var newWorkerQs []Workerq
+		for i := range template.Deployment.WorkerQs {
+			if template.Deployment.WorkerQs[i].Name == "default" {
+				template.Deployment.WorkerQs[i].PodCPU = ""
+				template.Deployment.WorkerQs[i].PodRAM = ""
+				newWorkerQs = append(newWorkerQs, template.Deployment.WorkerQs[i])
+			}
+		}
+		template.Deployment.WorkerQs = newWorkerQs
 	}
 
 	return template

diff --git a/cloud/deployment/inspect/inspect_test.go b/cloud/deployment/inspect/inspect_test.go
@@ -1161,7 +1161,12 @@ func TestFormatPrintableDeployment(t *testing.T) {
             "cloud_provider": "",
             "region": ""
         },
-        "worker_queues": null,
+        "worker_queues": [
+            {
+                "name": "default",
+                "worker_type": "test-instance-type"
+            }
+        ],
         "alert_emails": [
             "email1",
             "email2"