Skip to content

Commit 42a6e4b

Browse files
brettcurtisbrettcurtis
authored
Refactor tests and add shared helpers (#15)
1 parent b26a81b commit 42a6e4b

File tree

11 files changed

+27
-76
lines changed

11 files changed

+27
-76
lines changed

‎.github/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ changelog:
1010
labels:
1111
- dependencies
1212

13-
- title: 🔩 Dependencies
13+
- title: 🔩 Dependencies
1414
labels:
1515
- dependencies
1616

17-
# This file is managed by the osinfra-io/github-organization-management repository and should not be edited directly.
17+
# This file is managed by the osinfra-io/github-organization-management repository and should not be edited directly.

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ crash.log
1818
# be included in version control.
1919
local.tfvars
2020

21-
# Provider.tf is used for local development of modules and shouldn't be added to repos.
22-
provider.tf
23-
2421
# Ignore override files as they are usually used to override ressources locally
2522
override.tf
2623
override.tf.json

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repos:
1111
- id: check-symlinks
1212

1313
- repo: https://github.com/antonbabenko/pre-commit-terraform
14-
rev: v1.96.1
14+
rev: v1.96.2
1515
hooks:
1616
- id: terraform_fmt
1717

@@ -29,9 +29,11 @@ repos:
2929
- id: terraform_docs
3030

3131
- repo: https://github.com/bridgecrewio/checkov.git
32-
rev: 3.2.257
32+
rev: 3.2.296
3333
hooks:
3434
- id: checkov
3535
verbose: true
3636
args:
37+
- --skip-check
38+
- "CKV_TF_1"
3739
- --quiet

‎regional/helpers.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../shared/helpers.tf

‎regional/locals.tf‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,7 @@
22
# https://www.terraform.io/docs/language/values/locals.html
33

44
locals {
5-
cluster_name = local.zone != null ? "${var.cluster_prefix}-${local.region}-${local.zone}-${local.env}" : "${var.cluster_prefix}-${local.region}-${local.env}"
6-
env = lookup(local.env_map, local.environment, "none")
7-
8-
env_map = {
9-
"non-production" = "nonprod"
10-
"production" = "prod"
11-
"sandbox" = "sb"
12-
}
13-
14-
environment = (
15-
terraform.workspace == "default" ?
16-
"mock-environment" :
17-
regex(".*-(?P<environment>[^-]+)$", terraform.workspace)["environment"]
18-
)
5+
cluster_name = module.helpers.zone != null ? "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.zone}-${module.helpers.env}" : "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.env}"
196

207
helm_sensitive_values = {
218
"apiKey" = var.api_key
@@ -25,29 +12,12 @@ locals {
2512
helm_values = {
2613
"clusterName" = local.cluster_name
2714
"datadogMonitor.enabled" = true
28-
"podLabels.tags\\.datadoghq\\.com/env" = local.environment
15+
"podLabels.tags\\.datadoghq\\.com/env" = module.helpers.environment
2916
"podLabels.tags\\.datadoghq\\.com/version" = var.operator_version
3017
"resources.limits.cpu" = var.limits_cpu
3118
"resources.limits.memory" = var.limits_memory
3219
"resources.requests.cpu" = var.requests_cpu
3320
"resources.requests.memory" = var.requests_memory
3421
"watchNamespaces" = join(",", var.watch_namespaces)
3522
}
36-
37-
region = (
38-
terraform.workspace == "default" ?
39-
"mock-region" :
40-
regex("^(?P<region>[^-]+-[^-]+)", terraform.workspace)["region"]
41-
)
42-
43-
44-
zone = (
45-
terraform.workspace == "default" ?
46-
"mock-zone" :
47-
(
48-
regex("^(?P<region>[^-]+-[^-]+)(?:-(?P<zone>[^-]+))?-.*$", terraform.workspace)["zone"] != "" ?
49-
regex("^(?P<region>[^-]+-[^-]+)(?:-(?P<zone>[^-]+))?-.*$", terraform.workspace)["zone"] :
50-
null
51-
)
52-
)
5323
}

‎regional/manifests/helpers.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../shared/helpers.tf

‎regional/manifests/locals.tf‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,7 @@
22
# https://www.terraform.io/docs/language/values/locals.html
33

44
locals {
5-
cluster_name = local.zone != null ? "${var.cluster_prefix}-${local.region}-${local.zone}-${local.env}" : "${var.cluster_prefix}-${local.region}-${local.env}"
6-
7-
env = lookup(local.env_map, local.environment, "none")
8-
9-
env_map = {
10-
"non-production" = "nonprod"
11-
"production" = "prod"
12-
"sandbox" = "sb"
13-
}
14-
15-
environment = (
16-
terraform.workspace == "default" ?
17-
"mock-environment" :
18-
(regex(".*-(?P<environment>[^-]+)$", terraform.workspace)["environment"])
19-
)
5+
cluster_name = module.helpers.zone != null ? "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.zone}-${module.helpers.env}" : "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.env}"
206

217
kubernetes_monitor_templates = {
228
"crash-loop-backoff" = {
@@ -188,18 +174,12 @@ locals {
188174
name = "DD_CONTAINER_EXCLUDE"
189175
value = "kube_namespace:^gke-managed-cim$ kube_namespace:^gke-managed-system kube_namespace:^gke-mcs$ kube_namespace:^gmp-system$ kube_namespace:^kube-node-lease$ kube_namespace:^kube-public$ kube_namespace:^kube-system$ ${var.node_agent_env_dd_container_exclude}"
190176
},
191-
# {
192-
# name = "DD_IGNORE_AUTOCONF"
193-
# value = "cilium ${var.node_agent_env_dd_ignore_auto_conf}"
194-
# }
177+
{
178+
name = "DD_IGNORE_AUTOCONF"
179+
value = "cilium ${var.node_agent_env_dd_ignore_auto_conf}"
180+
}
195181
]
196182

197-
region = (
198-
terraform.workspace == "default" ?
199-
"mock-region" :
200-
(regex("^(?P<region>[^-]+-[^-]+)", terraform.workspace)["region"])
201-
)
202-
203183
trace_agent_env_vars = [
204184

205185
# Ignoring Unwanted Resources in APM
@@ -213,15 +193,9 @@ locals {
213193

214194
tags = [
215195
"cluster:${local.cluster_name}",
216-
"env:${local.environment}",
196+
"env:${module.helpers.environment}",
217197
"generated:kubernetes",
218-
"region:${local.region}",
198+
"region:${module.helpers.region}",
219199
"team:${var.team}"
220200
]
221-
222-
zone = (
223-
terraform.workspace == "default" ?
224-
"mock-zone" :
225-
(regex("^(?P<region>[^-]+-[^-]+)-(?P<zone>[^-]+)", terraform.workspace)["zone"])
226-
)
227201
}

‎regional/manifests/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ resource "kubernetes_manifest" "agent" {
9494
env = var.cluster_agent_env_vars
9595

9696
labels = {
97-
"tags.datadoghq.com/env" = local.environment
97+
"tags.datadoghq.com/env" = module.helpers.environment
9898
"tags.datadoghq.com/service" = "datadog-cluster-agent"
9999
"tags.datadoghq.com/version" = var.node_agent_tag
100100
}
@@ -162,7 +162,7 @@ resource "kubernetes_manifest" "agent" {
162162
}
163163

164164
labels = {
165-
"tags.datadoghq.com/env" = local.environment
165+
"tags.datadoghq.com/env" = module.helpers.environment
166166
"tags.datadoghq.com/service" = "datadog-agent"
167167
"tags.datadoghq.com/version" = var.node_agent_tag
168168
}

‎regional/manifests/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ variable "node_agent_requests_memory" {
192192
variable "node_agent_tag" {
193193
description = "Tag for the Datadog node agent image"
194194
type = string
195-
default = "7.57.2"
195+
default = "7.58.1"
196196
}
197197

198198
variable "node_agent_tolerations" {

‎regional/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ variable "limits_memory" {
3939
variable "operator_version" {
4040
description = "The version of the Datadog Operator to install"
4141
type = string
42-
default = "2.1.0"
42+
default = "2.2.0"
4343
}
4444

4545
variable "requests_cpu" {

0 commit comments

Comments
 (0)