Also set resource k8s limits/requests on the apply job (#1553)

* [HELM] - Job Label Chart Fix (#1551) The current helm chart has a typo in the 'controller.jobsLabels', this should have been 'controller.jobLabels', which is what the actual template references * Also set resource k8s limits/requests on the apply job --------- Co-authored-by: Rohith Jayawardene <[email protected]>
appvia · Nov 13, 2024 · d039b61 · d039b61
1 parent 89ddaf2
commit d039b61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/charts/terranetes-controller/Chart.yaml b/charts/terranetes-controller/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: terranetes-controller
 description: Controller used to provision a terraform workflow within kubernetes
 type: application
-version: v0.7.22
+version: v0.7.23
 appVersion: v0.4.16
 sources:
   - https://github.com/appvia/terranetes-controller

diff --git a/pkg/controller/configuration/ensure.go b/pkg/controller/configuration/ensure.go
@@ -1254,16 +1254,20 @@ func (c *Controller) ensureTerraformApply(configuration *terraformv1alpha1.Confi
 					terraformv1alpha1.JobTemplateHashLabel: state.jobTemplateHash,
 				},
 			),
-			BackoffLimit:       c.BackoffLimit,
-			EnableInfraCosts:   c.EnableInfracosts,
-			ExecutorImage:      c.ExecutorImage,
-			ExecutorSecrets:    c.ExecutorSecrets,
-			InfracostsImage:    c.InfracostsImage,
-			InfracostsSecret:   c.InfracostsSecretName,
-			Namespace:          c.ControllerNamespace,
-			SaveTerraformState: saveState,
-			Template:           state.jobTemplate,
-			TerraformImage:     GetTerraformImage(configuration, c.TerraformImage),
+			BackoffLimit:                 c.BackoffLimit,
+			DefaultExecutorCPULimit:      c.DefaultExecutorCPULimit,
+			DefaultExecutorCPURequest:    c.DefaultExecutorCPURequest,
+			DefaultExecutorMemoryLimit:   c.DefaultExecutorMemoryLimit,
+			DefaultExecutorMemoryRequest: c.DefaultExecutorMemoryRequest,
+			EnableInfraCosts:             c.EnableInfracosts,
+			ExecutorImage:                c.ExecutorImage,
+			ExecutorSecrets:              c.ExecutorSecrets,
+			InfracostsImage:              c.InfracostsImage,
+			InfracostsSecret:             c.InfracostsSecretName,
+			Namespace:                    c.ControllerNamespace,
+			SaveTerraformState:           saveState,
+			Template:                     state.jobTemplate,
+			TerraformImage:               GetTerraformImage(configuration, c.TerraformImage),
 		})
 		if err != nil {
 			cond.Failed(err, "Failed to create the terraform apply job")