Skip to content

Commit 2eeacf1

Browse files
authored
feat: added freeform tagging for pvc and nodepools (#552)
* feat: added freeform tagging for pvc and nodepools Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
1 parent 1b5a0a8 commit 2eeacf1

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

modules/oke/cluster.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
1313
kubernetes_version = var.cluster_kubernetes_version
1414
kms_key_id = var.use_cluster_encryption == true ? var.cluster_kms_key_id : null
1515
name = var.label_prefix == "none" ? var.cluster_name : "${var.label_prefix}-${var.cluster_name}"
16-
16+
1717
depends_on = [time_sleep.wait_30_seconds]
1818

1919
cluster_pod_network_options {
@@ -60,6 +60,10 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
6060
services_cidr = var.cluster_options_kubernetes_network_config_services_cidr
6161
}
6262

63+
persistent_volume_config {
64+
freeform_tags = var.freeform_tags["persistent_volume"]
65+
}
66+
6367
service_lb_config {
6468
freeform_tags = var.freeform_tags["service_lb"]
6569
}

modules/oke/nodepools.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ resource "oci_containerengine_node_pool" "nodepools" {
2727
subnet_id = var.cluster_subnets["workers"]
2828
}
2929
}
30+
3031
nsg_ids = var.worker_nsgs
3132

3233
# flannel requires cni type only
@@ -50,6 +51,8 @@ resource "oci_containerengine_node_pool" "nodepools" {
5051

5152
# allow zero-sized node pools
5253
size = max(0, lookup(each.value, "node_pool_size", 0))
54+
55+
freeform_tags = var.freeform_tags["persistent_volume"]
5356
}
5457

5558
# setting shape

terraform.tfvars.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ freeform_tags = {
280280
environment = "dev"
281281
role = "cluster"
282282
}
283+
persistent_volume = {
284+
environment = "dev"
285+
}
283286
service_lb = {
284287
environment = "dev"
285288
role = "load balancer"

variables.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -935,13 +935,19 @@ variable "freeform_tags" {
935935
role = "operator"
936936
}
937937
oke = {
938-
service_lb = {
938+
939+
cluster = {
939940
environment = "dev"
940-
role = "load balancer"
941941
}
942-
cluster = {
942+
943+
persistent_volume = {
943944
environment = "dev"
944945
}
946+
947+
service_lb = {
948+
environment = "dev"
949+
role = "load balancer"
950+
}
945951
node_pool = {}
946952
}
947953
}

0 commit comments

Comments
 (0)