Skip to content

Commit 1c12232

Browse files
fix: Remove legacy benchmark task creation (#142)
* fix: Remove legacy benchmark task creation * Remove task submodules, fix lint errors * Fix linting errors * Lint fixes --------- Co-authored-by: Noah Kraemer <[email protected]>
1 parent 13af6a3 commit 1c12232

File tree

28 files changed

+2
-271
lines changed

28 files changed

+2
-271
lines changed

examples/organization-org_compliance/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ module "secure-for-cloud_example_organization" {
147147
|------|-------------|------|---------|:--------:|
148148
| <a name="input_organization_domain"></a> [organization\_domain](#input\_organization\_domain) | Organization domain. e.g. sysdig.com | `string` | n/a | yes |
149149
| <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
150-
| <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 regions by default. | `list(string)` | `[]` | no |
151150
| <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
152151
| <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
153152
| <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |
@@ -213,7 +212,6 @@ Apache 2 Licensed. See LICENSE for full details.
213212
| Name | Description | Type | Default | Required |
214213
|------|-------------|------|---------|:--------:|
215214
| <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
216-
| <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 regions by default. | `list(string)` | `[]` | no |
217215
| <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
218216
| <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
219217
| <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |

examples/organization-org_compliance/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ module "cloud_bench_workload_identity" {
128128

129129
organization_domain = var.organization_domain
130130
role_name = var.benchmark_role_name
131-
regions = var.benchmark_regions
132131
project_ids = var.benchmark_project_ids
133132
project_id = data.google_client_config.current.project
134133
}

examples/organization-org_compliance/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ variable "deploy_benchmark" {
4040
default = true
4141
}
4242

43-
variable "benchmark_regions" {
44-
type = list(string)
45-
description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
46-
default = []
47-
}
48-
4943
variable "benchmark_project_ids" {
5044
default = []
5145
type = list(string)

examples/organization/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ module "secure-for-cloud_example_organization" {
141141
|------|-------------|------|---------|:--------:|
142142
| <a name="input_organization_domain"></a> [organization\_domain](#input\_organization\_domain) | Organization domain. e.g. sysdig.com | `string` | n/a | yes |
143143
| <a name="input_benchmark_project_ids"></a> [benchmark\_project\_ids](#input\_benchmark\_project\_ids) | Google cloud project IDs to run Benchmarks on. It will create a trust-relationship on each, to allow Sysdig usage. If empty, all organization projects will be defaulted. | `list(string)` | `[]` | no |
144-
| <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 regions by default. | `list(string)` | `[]` | no |
145144
| <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
146145
| <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |
147146
| <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | true/false whether scanning module is to be deployed | `bool` | `false` | no |

examples/organization/benchmark.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ module "cloud_bench" {
1414
is_organizational = true
1515
organization_domain = var.organization_domain
1616
role_name = "${var.name}${var.benchmark_role_name}"
17-
regions = var.benchmark_regions
1817
project_ids = local.benchmark_projects_ids
1918
}

examples/organization/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ variable "deploy_benchmark" {
4141
default = true
4242
}
4343

44-
variable "benchmark_regions" {
45-
type = list(string)
46-
description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
47-
default = []
48-
}
49-
5044
variable "benchmark_project_ids" {
5145
default = []
5246
type = list(string)

examples/single-project-k8s/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)
111111

112112
| Name | Description | Type | Default | Required |
113113
|------|-------------|------|---------|:--------:|
114-
| <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 regions by default. | `list(string)` | `[]` | no |
115114
| <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
116115
| <a name="input_cloud_connector_image"></a> [cloud\_connector\_image](#input\_cloud\_connector\_image) | Cloud-connector image to deploy | `string` | `"quay.io/sysdig/cloud-connector"` | no |
117116
| <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |

examples/single-project-k8s/benchmark.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ module "cloud_bench" {
55
is_organizational = false
66
role_name = "${var.name}${var.benchmark_role_name}"
77
project_id = data.google_client_config.current.project
8-
regions = var.benchmark_regions
98
reuse_workload_identity_pool = var.reuse_workload_identity_pool
109
}

examples/single-project-k8s/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ variable "deploy_benchmark" {
1616
default = true
1717
}
1818

19-
variable "benchmark_regions" {
20-
type = list(string)
21-
description = "List of regions in which to run the benchmark. If empty, the task will contain all regions by default."
22-
default = []
23-
}
24-
2519
variable "benchmark_role_name" {
2620
type = string
2721
description = "The name of the Service Account that will be created."

examples/single-project/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ module "secure-for-cloud_example_single-project" {
108108

109109
| Name | Description | Type | Default | Required |
110110
|------|-------------|------|---------|:--------:|
111-
| <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 regions by default. | `list(string)` | `[]` | no |
112111
| <a name="input_benchmark_role_name"></a> [benchmark\_role\_name](#input\_benchmark\_role\_name) | The name of the Service Account that will be created. | `string` | `"sysdigcloudbench"` | no |
113112
| <a name="input_cloud_connector_image"></a> [cloud\_connector\_image](#input\_cloud\_connector\_image) | The image to use for the Cloud Connector. | `string` | `"us-docker.pkg.dev/sysdig-public-registry/secure-for-cloud/cloud-connector:latest"` | no |
114113
| <a name="input_deploy_benchmark"></a> [deploy\_benchmark](#input\_deploy\_benchmark) | whether benchmark module is to be deployed | `bool` | `true` | no |

0 commit comments

Comments
 (0)