Skip to content

Commit 642d3c7

Browse files
juniorjunior
committed
freeform tags redesigned
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent 51b9478 commit 642d3c7

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎modules/oke-node-pool/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
99
name = var.node_pool_name
1010
node_shape = var.node_pool_shape
1111
ssh_public_key = var.public_ssh_key
12-
freeform_tags = var.freeform_deployment_tags
12+
freeform_tags = var.node_pools_freeform_deployment_tags
1313

1414
node_config_details {
1515
dynamic "placement_configs" {
@@ -26,7 +26,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
2626
# nsg_ids = []
2727
size = var.node_pool_min_nodes
2828
kms_key_id = var.oci_vault_key_id_oke_node_boot_volume != "" ? var.oci_vault_key_id_oke_node_boot_volume : null
29-
freeform_tags = var.freeform_deployment_tags
29+
freeform_tags = var.worker_nodes_freeform_deployment_tags
3030
}
3131

3232
dynamic "node_shape_config" {

‎modules/oke/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "oci_containerengine_cluster" "oke_cluster" {
88
name = "${local.app_name} (${local.deploy_id})"
99
vcn_id = oci_core_virtual_network.oke_vcn[0].id
1010
kms_key_id = var.oci_vault_key_id_oke_secrets != "" ? var.oci_vault_key_id_oke_secrets : null
11-
freeform_tags = var.freeform_deployment_tags
11+
freeform_tags = var.cluster_freeform_deployment_tags
1212

1313
endpoint_config {
1414
is_public_ip_enabled = (var.cluster_endpoint_visibility == "Private") ? false : true
@@ -29,10 +29,10 @@ resource "oci_containerengine_cluster" "oke_cluster" {
2929
pods_cidr = lookup(var.network_cidrs, "PODS-CIDR")
3030
}
3131
persistent_volume_config {
32-
freeform_tags = var.freeform_deployment_tags
32+
freeform_tags = var.block_volumes_freeform_deployment_tags
3333
}
3434
service_lb_config {
35-
freeform_tags = var.freeform_deployment_tags
35+
freeform_tags = var.load_balancers_freeform_deployment_tags
3636
}
3737
}
3838
image_policy_config {

‎modules/oke/network.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resource "oci_core_virtual_network" "oke_vcn" {
77
compartment_id = local.oke_compartment_ocid
88
display_name = "OKE ${local.app_name} VCN - ${local.deploy_id}"
99
dns_label = "oke${local.deploy_id}"
10-
freeform_tags = var.freeform_deployment_tags
10+
freeform_tags = var.cluster_freeform_deployment_tags
1111

1212
count = var.create_new_oke_cluster ? 1 : 0
1313
}
@@ -22,7 +22,7 @@ resource "oci_core_subnet" "oke_k8s_endpoint_subnet" {
2222
route_table_id = (var.cluster_endpoint_visibility == "Private") ? oci_core_route_table.oke_private_route_table[0].id : oci_core_route_table.oke_public_route_table[0].id
2323
dhcp_options_id = oci_core_virtual_network.oke_vcn[0].default_dhcp_options_id
2424
security_list_ids = [oci_core_security_list.oke_endpoint_security_list[0].id]
25-
freeform_tags = var.freeform_deployment_tags
25+
freeform_tags = var.cluster_freeform_deployment_tags
2626

2727
count = var.create_new_oke_cluster ? 1 : 0
2828
}
@@ -36,7 +36,7 @@ resource "oci_core_subnet" "oke_nodes_subnet" {
3636
route_table_id = (var.cluster_workers_visibility == "Private") ? oci_core_route_table.oke_private_route_table[0].id : oci_core_route_table.oke_public_route_table[0].id
3737
dhcp_options_id = oci_core_virtual_network.oke_vcn[0].default_dhcp_options_id
3838
security_list_ids = [oci_core_security_list.oke_nodes_security_list[0].id]
39-
freeform_tags = var.freeform_deployment_tags
39+
freeform_tags = var.cluster_freeform_deployment_tags
4040

4141
count = var.create_new_oke_cluster ? 1 : 0
4242
}
@@ -50,7 +50,7 @@ resource "oci_core_subnet" "oke_lb_subnet" {
5050
route_table_id = oci_core_route_table.oke_public_route_table[0].id
5151
dhcp_options_id = oci_core_virtual_network.oke_vcn[0].default_dhcp_options_id
5252
security_list_ids = [oci_core_security_list.oke_lb_security_list[0].id]
53-
freeform_tags = var.freeform_deployment_tags
53+
freeform_tags = var.cluster_freeform_deployment_tags
5454

5555
count = var.create_new_oke_cluster ? 1 : 0
5656
}
@@ -73,7 +73,7 @@ resource "oci_core_route_table" "oke_private_route_table" {
7373
compartment_id = local.oke_compartment_ocid
7474
vcn_id = oci_core_virtual_network.oke_vcn[0].id
7575
display_name = "oke-private-route-table-${local.app_name_normalized}-${local.deploy_id}"
76-
freeform_tags = var.freeform_deployment_tags
76+
freeform_tags = var.cluster_freeform_deployment_tags
7777

7878
route_rules {
7979
description = "Traffic to the internet"
@@ -94,7 +94,7 @@ resource "oci_core_route_table" "oke_public_route_table" {
9494
compartment_id = local.oke_compartment_ocid
9595
vcn_id = oci_core_virtual_network.oke_vcn[0].id
9696
display_name = "oke-public-route-table-${local.app_name_normalized}-${local.deploy_id}"
97-
freeform_tags = var.freeform_deployment_tags
97+
freeform_tags = var.cluster_freeform_deployment_tags
9898

9999
route_rules {
100100
description = "Traffic to/from internet"
@@ -126,7 +126,7 @@ resource "oci_core_nat_gateway" "oke_nat_gateway" {
126126
compartment_id = local.oke_compartment_ocid
127127
display_name = "oke-nat-gateway-${local.app_name_normalized}-${local.deploy_id}"
128128
vcn_id = oci_core_virtual_network.oke_vcn[0].id
129-
freeform_tags = var.freeform_deployment_tags
129+
freeform_tags = var.cluster_freeform_deployment_tags
130130

131131
count = var.create_new_oke_cluster ? 1 : 0
132132
}
@@ -136,7 +136,7 @@ resource "oci_core_internet_gateway" "oke_internet_gateway" {
136136
display_name = "oke-internet-gateway-${local.app_name_normalized}-${local.deploy_id}"
137137
enabled = true
138138
vcn_id = oci_core_virtual_network.oke_vcn[0].id
139-
freeform_tags = var.freeform_deployment_tags
139+
freeform_tags = var.cluster_freeform_deployment_tags
140140

141141
count = var.create_new_oke_cluster ? 1 : 0
142142
}
@@ -145,7 +145,7 @@ resource "oci_core_service_gateway" "oke_service_gateway" {
145145
compartment_id = local.oke_compartment_ocid
146146
display_name = "oke-service-gateway-${local.app_name_normalized}-${local.deploy_id}"
147147
vcn_id = oci_core_virtual_network.oke_vcn[0].id
148-
freeform_tags = var.freeform_deployment_tags
148+
freeform_tags = var.cluster_freeform_deployment_tags
149149

150150
services {
151151
service_id = lookup(data.oci_core_services.all_services.services[0], "id")

‎modules/oke/oke-orm-private-endpoint.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resource "oci_resourcemanager_private_endpoint" "private_kubernetes_endpoint" {
1313
description = "Resource Manager Private Endpoint for OKE for the ${local.app_name} - ${local.deploy_id}"
1414
vcn_id = oci_core_virtual_network.oke_vcn[0].id
1515
subnet_id = oci_core_subnet.oke_k8s_endpoint_subnet[0].id
16-
freeform_tags = var.freeform_deployment_tags
16+
freeform_tags = var.cluster_freeform_deployment_tags
1717

1818
count = var.create_new_oke_cluster ? ((var.cluster_endpoint_visibility == "Private") ? 1 : 0) : 0
1919
}

‎modules/oke/security-lists.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "oci_core_security_list" "oke_nodes_security_list" {
66
compartment_id = local.oke_compartment_ocid
77
display_name = "oke-nodes-wkr-seclist-${local.app_name_normalized}-${local.deploy_id}"
88
vcn_id = oci_core_virtual_network.oke_vcn[0].id
9-
freeform_tags = var.freeform_deployment_tags
9+
freeform_tags = var.cluster_freeform_deployment_tags
1010

1111
# Ingresses
1212
ingress_security_rules {
@@ -131,7 +131,7 @@ resource "oci_core_security_list" "oke_lb_security_list" {
131131
compartment_id = local.oke_compartment_ocid
132132
display_name = "oke-lb-seclist-${local.app_name_normalized}-${local.deploy_id}"
133133
vcn_id = oci_core_virtual_network.oke_vcn[0].id
134-
freeform_tags = var.freeform_deployment_tags
134+
freeform_tags = var.cluster_freeform_deployment_tags
135135

136136
count = var.create_new_oke_cluster ? 1 : 0
137137
}
@@ -140,7 +140,7 @@ resource "oci_core_security_list" "oke_endpoint_security_list" {
140140
compartment_id = local.oke_compartment_ocid
141141
display_name = "oke-k8s-api-endpoint-seclist-${local.app_name_normalized}-${local.deploy_id}"
142142
vcn_id = oci_core_virtual_network.oke_vcn[0].id
143-
freeform_tags = var.freeform_deployment_tags
143+
freeform_tags = var.cluster_freeform_deployment_tags
144144

145145
# Ingresses
146146

0 commit comments

Comments
 (0)