Skip to content

Commit d039b61

Browse files
ronaldvb-kgambol99
andauthored
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 <gambol99@gmail.com>
1 parent 89ddaf2 commit d039b61

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

charts/terranetes-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v2
33
name: terranetes-controller
44
description: Controller used to provision a terraform workflow within kubernetes
55
type: application
6-
version: v0.7.22
6+
version: v0.7.23
77
appVersion: v0.4.16
88
sources:
99
- https://github.com/appvia/terranetes-controller

pkg/controller/configuration/ensure.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,16 +1254,20 @@ func (c *Controller) ensureTerraformApply(configuration *terraformv1alpha1.Confi
12541254
terraformv1alpha1.JobTemplateHashLabel: state.jobTemplateHash,
12551255
},
12561256
),
1257-
BackoffLimit: c.BackoffLimit,
1258-
EnableInfraCosts: c.EnableInfracosts,
1259-
ExecutorImage: c.ExecutorImage,
1260-
ExecutorSecrets: c.ExecutorSecrets,
1261-
InfracostsImage: c.InfracostsImage,
1262-
InfracostsSecret: c.InfracostsSecretName,
1263-
Namespace: c.ControllerNamespace,
1264-
SaveTerraformState: saveState,
1265-
Template: state.jobTemplate,
1266-
TerraformImage: GetTerraformImage(configuration, c.TerraformImage),
1257+
BackoffLimit: c.BackoffLimit,
1258+
DefaultExecutorCPULimit: c.DefaultExecutorCPULimit,
1259+
DefaultExecutorCPURequest: c.DefaultExecutorCPURequest,
1260+
DefaultExecutorMemoryLimit: c.DefaultExecutorMemoryLimit,
1261+
DefaultExecutorMemoryRequest: c.DefaultExecutorMemoryRequest,
1262+
EnableInfraCosts: c.EnableInfracosts,
1263+
ExecutorImage: c.ExecutorImage,
1264+
ExecutorSecrets: c.ExecutorSecrets,
1265+
InfracostsImage: c.InfracostsImage,
1266+
InfracostsSecret: c.InfracostsSecretName,
1267+
Namespace: c.ControllerNamespace,
1268+
SaveTerraformState: saveState,
1269+
Template: state.jobTemplate,
1270+
TerraformImage: GetTerraformImage(configuration, c.TerraformImage),
12671271
})
12681272
if err != nil {
12691273
cond.Failed(err, "Failed to create the terraform apply job")

0 commit comments

Comments
 (0)