Skip to content

Commit 448bde6

Browse files
authored
chore: Make cloud-connector image configurable (#156)
1 parent 66e8002 commit 448bde6

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

examples/single-account-ecs/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ $ terraform apply
9898
| Name | Description | Type | Default | Required |
9999
|------|-------------|------|---------|:--------:|
100100
| <a name="input_benchmark_regions"></a> [benchmark\_regions](#input\_benchmark\_regions) | List of regions in which to run the benchmark. If empty, the task will contain all aws regions by default. | `list(string)` | `[]` | no |
101+
| <a name="input_cloud_connector_image"></a> [cloud\_connector\_image](#input\_cloud\_connector\_image) | Image to use for the cloud connector. If empty, the default image will be used. | `string` | `"quay.io/sysdig/cloud-connector:latest"` | no |
101102
| <a name="input_cloudtrail_is_multi_region_trail"></a> [cloudtrail\_is\_multi\_region\_trail](#input\_cloudtrail\_is\_multi\_region\_trail) | true/false whether cloudtrail will ingest multiregional events | `bool` | `true` | no |
102103
| <a name="input_cloudtrail_kms_enable"></a> [cloudtrail\_kms\_enable](#input\_cloudtrail\_kms\_enable) | true/false whether cloudtrail delivered events to S3 should persist encrypted | `bool` | `true` | no |
103104
| <a name="input_cloudtrail_s3_bucket_expiration_days"></a> [cloudtrail\_s3\_bucket\_expiration\_days](#input\_cloudtrail\_s3\_bucket\_expiration\_days) | Number of days that the logs will persist in the bucket | `number` | `5` | no |

examples/single-account-ecs/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ module "cloud_connector" {
6262
ecs_vpc_subnets_private_ids = local.ecs_vpc_subnets_private_ids
6363
ecs_task_cpu = var.ecs_task_cpu
6464
ecs_task_memory = var.ecs_task_memory
65+
image = var.cloud_connector_image
6566

6667
tags = var.tags
6768
depends_on = [local.cloudtrail_sns_arn, module.ssm]

examples/single-account-ecs/variables.tf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
#---------------------------------
42
# optionals - with defaults
53
#---------------------------------
@@ -112,6 +110,14 @@ variable "benchmark_regions" {
112110
default = []
113111
}
114112

113+
#
114+
# cloud connector connector configuration
115+
#
116+
variable "cloud_connector_image" {
117+
type = string
118+
description = "Image to use for the cloud connector. If empty, the default image will be used."
119+
default = "quay.io/sysdig/cloud-connector:latest"
120+
}
115121

116122
#
117123
# general

modules/services/cloud-connector-ecs/ecs-service.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ resource "aws_ecs_service" "service" {
1111
security_groups = [aws_security_group.sg.id]
1212
}
1313

14-
desired_count = 1
15-
launch_type = "FARGATE"
16-
task_definition = aws_ecs_task_definition.task_definition.arn
17-
tags = var.tags
14+
desired_count = 1
15+
launch_type = "FARGATE"
16+
task_definition = aws_ecs_task_definition.task_definition.arn
17+
wait_for_steady_state = true
18+
tags = var.tags
1819
}
1920

2021

use-cases/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ With both examples `single` and `org`, you can customize the desired features to
6363

6464
### unified-compliance only
6565

66-
If you just want [CIS Unified Compliance Benchmarks](https://docs.sysdig.com/en/docs/sysdig-secure/posture/compliance/compliance-unified-/)
67-
you can make use of
66+
If you just want [CIS Unified Compliance Benchmarks](https://docs.sysdig.com/en/docs/sysdig-secure/posture/compliance/compliance-unified-/)
67+
you can make use of
6868

6969
- [Single-Account Compliance Role Setup](./compliance-role-single-account.md)
7070
- [Organizational Compliance Role setup](./compliance-role-organizational.md)

use-cases/compliance-role-organizational.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ provider "aws" {
2727
module "sysdig-sfc" {
2828
source = "sysdiglabs/secure-for-cloud/aws//modules/services/cloud-bench"
2929
name = "sysdig-compliance-role" # optional
30-
30+
3131
is_organizational=true
3232
}
3333
```

0 commit comments

Comments
 (0)