feat: add outputs for cluster endpoint urls (#862)<br> - added new ou…

…tputs for cluster endpoints: public and private service endpoints, ingress subdomain, and web console * feat: added public service endpint url for the cluster * feat: added public service endpint url for the cluster * feat: added public service endpint url for the cluster * feat: added networking urls for the clsuter * feat: added networking urls for the clsuter * feat: added networking urls for the clsuter --------- Co-authored-by: Rajat Agrawal <[email protected]> Co-authored-by: Conall Ó Cofaigh <[email protected]>
terraform-ibm-modules · Aug 27, 2024 · 6f65f1b · 6f65f1b
1 parent 9fe2a93
commit 6f65f1b
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 6 deletions.
diff --git a/outputs.tf b/outputs.tf
@@ -89,12 +89,16 @@ output "cluster_data" {
   value = {
     for cluster in ibm_container_vpc_cluster.cluster :
     cluster.name => {
-      crn                 = cluster.crn
-      id                  = cluster.id
-      resource_group_name = cluster.resource_group_name
-      resource_group_id   = cluster.resource_group_id
-      vpc_id              = cluster.vpc_id
-      region              = var.region
+      crn                          = cluster.crn
+      id                           = cluster.id
+      resource_group_name          = cluster.resource_group_name
+      resource_group_id            = cluster.resource_group_id
+      vpc_id                       = cluster.vpc_id
+      region                       = var.region
+      private_service_endpoint_url = cluster.private_service_endpoint_url
+      public_service_endpoint_url  = (cluster.public_service_endpoint_url != "" && cluster.public_service_endpoint_url != null) ? cluster.public_service_endpoint_url : null
+      ingress_hostname             = cluster.ingress_hostname
+      cluster_console_url          = (cluster.public_service_endpoint_url != "" && cluster.public_service_endpoint_url != null) ? "https://console-openshift-console.${cluster.ingress_hostname}" : null
     }
   }
 }

diff --git a/patterns/roks-quickstart/outputs.tf b/patterns/roks-quickstart/outputs.tf
@@ -67,6 +67,46 @@ output "management_cluster_id" {
   value       = module.landing_zone.management_cluster_id
 }
 
+output "workload_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Workload cluster ingress subdomain, if not then null."
+  value       = module.landing_zone.workload_cluster_ingress_hostname
+}
+
+output "management_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Management cluster ingress subdomain, if not then null."
+  value       = module.landing_zone.management_cluster_ingress_hostname
+}
+
+output "workload_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Workload cluster, if not then null."
+  value       = module.landing_zone.workload_cluster_private_service_endpoint_url
+}
+
+output "management_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Management cluster, if not then null."
+  value       = module.landing_zone.management_cluster_private_service_endpoint_url
+}
+
+output "workload_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Workload cluster, if not then null."
+  value       = module.landing_zone.workload_cluster_public_service_endpoint_url
+}
+
+output "management_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Management cluster, if not then null."
+  value       = module.landing_zone.management_cluster_public_service_endpoint_url
+}
+
+output "workload_cluster_console_url" {
+  description = "Workload cluster console URL, if not then null."
+  value       = module.landing_zone.workload_cluster_console_url
+}
+
+output "management_cluster_console_url" {
+  description = "Management cluster console URL, if not then null."
+  value       = module.landing_zone.management_cluster_console_url
+}
+
 output "key_management_name" {
   description = "Name of key management service"
   value       = module.landing_zone.key_management_name

diff --git a/patterns/roks/module/outputs.tf b/patterns/roks/module/outputs.tf
@@ -92,6 +92,94 @@ output "management_cluster_id" {
   value       = module.landing_zone.management_cluster_id
 }
 
+output "workload_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Workload cluster ingress subdomain, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.ingress_hostname
+      if can(regex("workload", name))
+    ])
+  )
+}
+
+output "management_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Management cluster ingress subdomain, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.ingress_hostname
+      if can(regex("management", name))
+    ])
+  )
+}
+
+output "workload_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Workload cluster, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.private_service_endpoint_url
+      if can(regex("workload", name))
+    ])
+  )
+}
+
+output "management_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Management cluster, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.private_service_endpoint_url
+      if can(regex("management", name))
+    ])
+  )
+}
+
+output "workload_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Workload cluster, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.public_service_endpoint_url
+      if can(regex("workload", name))
+    ])
+  )
+}
+
+output "management_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Management cluster, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.public_service_endpoint_url
+      if can(regex("management", name))
+    ])
+  )
+}
+
+output "workload_cluster_console_url" {
+  description = "Workload cluster console URL, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.cluster_console_url
+      if can(regex("workload", name))
+    ])
+  )
+}
+
+output "management_cluster_console_url" {
+  description = "Management cluster console URL, if not then null."
+  value = one(
+    flatten([
+      for name, cluster in module.landing_zone.cluster_data :
+      cluster.cluster_console_url
+      if can(regex("management", name))
+    ])
+  )
+}
+
 output "key_management_name" {
   description = "Name of key management service"
   value       = module.landing_zone.key_management_name

diff --git a/patterns/roks/outputs.tf b/patterns/roks/outputs.tf
@@ -92,6 +92,46 @@ output "management_cluster_id" {
   value       = module.roks_landing_zone.management_cluster_id
 }
 
+output "workload_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Workload cluster ingress subdomain, if not then null."
+  value       = module.roks_landing_zone.workload_cluster_ingress_hostname
+}
+
+output "management_cluster_ingress_hostname" {
+  description = "The hostname assigned for the Management cluster ingress subdomain, if not then null."
+  value       = module.roks_landing_zone.management_cluster_ingress_hostname
+}
+
+output "workload_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Workload cluster, if not then null."
+  value       = module.roks_landing_zone.workload_cluster_private_service_endpoint_url
+}
+
+output "management_cluster_private_service_endpoint_url" {
+  description = "The private service endpoint URL of the Management cluster, if not then null."
+  value       = module.roks_landing_zone.management_cluster_private_service_endpoint_url
+}
+
+output "workload_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Workload cluster, if not then null."
+  value       = module.roks_landing_zone.workload_cluster_public_service_endpoint_url
+}
+
+output "management_cluster_public_service_endpoint_url" {
+  description = "The public service endpoint URL of the Management cluster, if not then null."
+  value       = module.roks_landing_zone.management_cluster_public_service_endpoint_url
+}
+
+output "workload_cluster_console_url" {
+  description = "Workload cluster console URL, if not then null."
+  value       = module.roks_landing_zone.workload_cluster_console_url
+}
+
+output "management_cluster_console_url" {
+  description = "Management cluster console URL, if not then null."
+  value       = module.roks_landing_zone.management_cluster_console_url
+}
+
 output "key_management_name" {
   description = "Name of key management service"
   value       = module.roks_landing_zone.key_management_name