@@ -44,7 +44,9 @@ module "oke" {
44
44
region = var. region
45
45
46
46
# Deployment Tags + Freeform Tags
47
- freeform_deployment_tags = local. freeform_deployment_tags
47
+ cluster_freeform_deployment_tags = local. freeform_deployment_tags
48
+ load_balancers_freeform_deployment_tags = local. freeform_deployment_tags
49
+ block_volumes_freeform_deployment_tags = local. freeform_deployment_tags
48
50
49
51
# OKE Cluster
50
52
# # create_new_oke_cluster
@@ -74,7 +76,8 @@ module "oke_node_pool" {
74
76
source = " ./modules/oke-node-pool"
75
77
76
78
# Deployment Tags + Freeform Tags
77
- freeform_deployment_tags = local. freeform_deployment_tags
79
+ node_pools_freeform_deployment_tags = local. freeform_deployment_tags
80
+ worker_nodes_freeform_deployment_tags = local. freeform_deployment_tags
78
81
79
82
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
80
83
tenancy_ocid = var. tenancy_ocid
@@ -135,10 +138,6 @@ module "oke_cluster_autoscaler" {
135
138
}
136
139
137
140
# # OKE Cluster Details
138
- variable "app_name" {
139
- default = " K8s App"
140
- description = " Application name. Will be used as prefix to identify resources, such as OKE, VCN, ATP, and others"
141
- }
142
141
variable "create_new_oke_cluster" {
143
142
default = true
144
143
description = " Creates a new OKE cluster, node pool and network resources"
@@ -293,7 +292,7 @@ resource "random_string" "deploy_id" {
293
292
resource "oci_identity_compartment" "oke_compartment" {
294
293
compartment_id = var. compartment_ocid
295
294
name = " ${ local . app_name_normalized } -${ local . deploy_id } "
296
- description = " ${ var . app_name } ${ var . oke_compartment_description } (Deployment ${ local . deploy_id } )"
295
+ description = " ${ local . app_name } ${ var . oke_compartment_description } (Deployment ${ local . deploy_id } )"
297
296
enable_delete = true
298
297
299
298
count = var. create_new_compartment_for_oke ? 1 : 0
@@ -315,7 +314,9 @@ locals {
315
314
" Quickstart" = " oke_base" }
316
315
freeform_deployment_tags = merge (var. tag_values . freeformTags , local. deploy_tags )
317
316
workers_public_ssh_key = var. generate_public_ssh_key ? tls_private_key. oke_worker_node_ssh_key . public_key_openssh : var. public_ssh_key
317
+ app_name = var. app_name
318
318
app_name_normalized = substr (replace (lower (var. app_name ), " " , " -" ), 0 , 6 )
319
+ app_name_for_dns = substr (lower (replace (var. app_name , " /\\ W|_|\\ s/" , " " )), 0 , 6 )
319
320
}
320
321
321
322
# OKE Outputs
0 commit comments