Skip to content

Commit 89919f9

Browse files
authored
Make the default freeform_tags empty (#711)
Not tagging should be the default behaviour, consistently with defined_tags, to not force the user to override with an empty map. Also clean up defaults and documentation. Signed-off-by: Andrea Stacchiotti <[email protected]>
1 parent ae780eb commit 89919f9

File tree

2 files changed

+18
-42
lines changed

2 files changed

+18
-42
lines changed

docs/terraformoptions.adoc

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -588,22 +588,15 @@ EOT
588588
}`
589589
|
590590
`freeform_tags = {
591-
vcn = {
592-
environment = "dev"
593-
}
594-
bastion = {
595-
environment = "dev"
596-
role = "bastion"
597-
}
598-
operator = {
599-
environment = "dev"
600-
role = "operator"
601-
}
591+
vcn = {}
592+
bastion = {}
593+
operator = {}
602594
oke = {
603-
service_lb = {
604-
environment = "dev"
605-
role = "load balancer"
606-
}
595+
cluster = {}
596+
persistent_volume = {}
597+
service_lb = {}
598+
node_pool = {}
599+
node = {}
607600
}
608601
}`
609602

variables.tf

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ variable "drg_id" {
182182

183183
variable "remote_peering_connections" {
184184
description = "Map of parameters to add and optionally to peer to remote peering connections. Key-only items represent local acceptors and no peering attempted; items containing key and values represent local requestor and must have the OCID and region of the remote acceptor to peer to"
185-
type = map(any)
186-
default = {}
185+
type = map(any)
186+
default = {}
187187
}
188188

189189
variable "internet_gateway_route_rules" {
@@ -1053,32 +1053,15 @@ variable "freeform_tags" {
10531053
default = {
10541054
# vcn, bastion and operator tags are required
10551055
# add more tags in each as desired
1056-
vcn = {
1057-
environment = "dev"
1058-
}
1059-
bastion = {
1060-
environment = "dev"
1061-
role = "bastion"
1062-
}
1063-
operator = {
1064-
environment = "dev"
1065-
role = "operator"
1066-
}
1056+
vcn = {}
1057+
bastion = {}
1058+
operator = {}
10671059
oke = {
1068-
1069-
cluster = {
1070-
environment = "dev"
1071-
}
1072-
1073-
persistent_volume = {
1074-
environment = "dev"
1075-
}
1076-
1077-
service_lb = {
1078-
environment = "dev"
1079-
role = "load balancer"
1080-
}
1081-
node_pool = {}
1060+
cluster = {}
1061+
persistent_volume = {}
1062+
service_lb = {}
1063+
node_pool = {}
1064+
node = {}
10821065
}
10831066
}
10841067
description = "Tags to apply to different resources."

0 commit comments

Comments
 (0)