Skip to content

Commit 97819d1

Browse files
authored
Merge branch 'master' into fix/ec2-configuration
2 parents 9edfa5a + a20b255 commit 97819d1

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [3.0.2](https://github.com/terraform-aws-modules/terraform-aws-batch/compare/v3.0.1...v3.0.2) (2025-07-01)
6+
7+
8+
### Bug Fixes
9+
10+
* Remove erroneous `pod_properties` scoping from job definition variable attribute structure ([#45](https://github.com/terraform-aws-modules/terraform-aws-batch/issues/45)) ([7c8becf](https://github.com/terraform-aws-modules/terraform-aws-batch/commit/7c8becf486af35d9b14aa71299bc3c8f3b4fbe85))
11+
12+
## [3.0.1](https://github.com/terraform-aws-modules/terraform-aws-batch/compare/v3.0.0...v3.0.1) (2025-06-27)
13+
14+
15+
### Bug Fixes
16+
17+
* Correct launch template attribute values to match variable/API definition ([#43](https://github.com/terraform-aws-modules/terraform-aws-batch/issues/43)) ([3a07ad9](https://github.com/terraform-aws-modules/terraform-aws-batch/commit/3a07ad9f7cbe90011c36ba75c209a81ee1d8b1c4))
18+
519
## [3.0.0](https://github.com/terraform-aws-modules/terraform-aws-batch/compare/v2.1.0...v3.0.0) (2025-06-25)
620

721

main.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ resource "aws_batch_compute_environment" "this" {
4444
for_each = !contains(["FARGATE", "FARGATE_SPOT"], compute_resources.value.type) && compute_resources.value.launch_template != null ? [compute_resources.value.launch_template] : []
4545

4646
content {
47-
launch_template_id = launch_template.value.id
48-
launch_template_name = launch_template.value.name
47+
launch_template_id = launch_template.value.launch_template_id
48+
launch_template_name = launch_template.value.launch_template_name
4949
version = launch_template.value.version
5050
}
5151
}
@@ -452,19 +452,19 @@ resource "aws_batch_job_definition" "this" {
452452
}
453453
}
454454

455-
dns_policy = eks_properties.value.pod_properties.dns_policy
456-
host_network = eks_properties.value.pod_properties.host_network
455+
dns_policy = eks_properties.value.dns_policy
456+
host_network = eks_properties.value.host_network
457457

458458
dynamic "image_pull_secret" {
459-
for_each = eks_properties.value.pod_properties.image_pull_secrets != null ? eks_properties.value.pod_properties.image_pull_secrets : []
459+
for_each = eks_properties.value.image_pull_secrets != null ? eks_properties.value.image_pull_secrets : []
460460

461461
content {
462462
name = image_pull_secret.value.name
463463
}
464464
}
465465

466466
dynamic "init_containers" {
467-
for_each = eks_properties.value.pod_properties.init_containers != null ? eks_properties.value.pod_properties.init_containers : {}
467+
for_each = eks_properties.value.init_containers != null ? eks_properties.value.init_containers : {}
468468

469469
content {
470470
args = init_containers.value.args
@@ -517,18 +517,18 @@ resource "aws_batch_job_definition" "this" {
517517
}
518518

519519
dynamic "metadata" {
520-
for_each = eks_properties.value.pod_properties.metadata != null ? [eks_properties.value.pod_properties.metadata] : []
520+
for_each = eks_properties.value.metadata != null ? [eks_properties.value.metadata] : []
521521

522522
content {
523523
labels = metadata.value.labels
524524
}
525525
}
526526

527-
service_account_name = eks_properties.value.pod_properties.service_account_name
528-
share_process_namespace = eks_properties.value.pod_properties.share_process_namespace
527+
service_account_name = eks_properties.value.service_account_name
528+
share_process_namespace = eks_properties.value.share_process_namespace
529529

530530
dynamic "volumes" {
531-
for_each = eks_properties.value.pod_properties.volumes != null ? eks_properties.value.pod_properties.volumes : {}
531+
for_each = eks_properties.value.volumes != null ? eks_properties.value.volumes : {}
532532

533533
content {
534534
dynamic "empty_dir" {

0 commit comments

Comments
 (0)