Skip to content

Commit 2fec7c7

Browse files
authored
feat: Added support for adding service loadbalancer freeform_tags (#466)
* feat: Added support for adding service loadbalancer freeform_tags Signed-off-by: Nikhil Kota <srinivasa.nikhil.kota@oracle.com> * added freeform_tags in seperate section along with comment Signed-off-by: Nikhil Kota <srinivasa.nikhil.kota@oracle.com>
1 parent e2692fd commit 2fec7c7

File tree

5 files changed

+35
-1
lines changed

5 files changed

+35
-1
lines changed

docs/terraformoptions.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,12 @@ EOT
487487
environment = "dev"
488488
role = "operator"
489489
}
490+
oke = {
491+
service_lb = {
492+
environment = "dev"
493+
role = "load balancer"
494+
}
495+
}
490496
}`
491497
|
492498
`freeform_tags = {
@@ -501,6 +507,12 @@ EOT
501507
environment = "dev"
502508
role = "operator"
503509
}
510+
oke = {
511+
service_lb = {
512+
environment = "dev"
513+
role = "load balancer"
514+
}
515+
}
504516
}`
505517
|===
506518

main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ module "oke" {
240240
# worker nsgs
241241
worker_nsgs = concat(var.worker_nsgs, [module.network.worker_nsg_id])
242242

243+
# freeform_tags
244+
freeform_tags = var.freeform_tags["oke"]
245+
243246
depends_on = [
244247
module.network
245248
]

modules/oke/cluster.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
5454
services_cidr = var.cluster_options_kubernetes_network_config_services_cidr
5555
}
5656

57+
service_lb_config {
58+
freeform_tags = var.freeform_tags["service_lb"]
59+
}
60+
5761
service_lb_subnet_ids = var.preferred_load_balancer == "public" ? [var.cluster_subnets["pub_lb"]] : [var.cluster_subnets["int_lb"]]
5862
}
5963

modules/oke/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,8 @@ variable "preferred_load_balancer" {}
8383

8484
variable "worker_nsgs" {
8585
type = list(any)
86+
}
87+
88+
variable "freeform_tags" {
89+
type = map(any)
8690
}

variables.tf

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,9 +778,20 @@ variable "freeform_tags" {
778778
environment = "dev"
779779
role = "operator"
780780
}
781+
oke = {
782+
service_lb = {
783+
environment = "dev"
784+
role = "load balancer"
785+
}
786+
}
781787
}
782788
description = "Tags to apply to different resources."
783-
type = map(any)
789+
type = object({
790+
vcn = map(any),
791+
bastion = map(any),
792+
operator = map(any),
793+
oke = map(map(any))
794+
})
784795
}
785796

786797
# placeholder variable for debugging scripts. To be implemented in future

0 commit comments

Comments
 (0)