feat: enable_mesh_certificates

terraform-google-modules · Sep 11, 2023 · cb8ee1a · cb8ee1a
1 parent 00878e5
commit cb8ee1a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 16 deletions.
diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
@@ -171,13 +171,16 @@ output "identity_namespace" {
   ]
 }
 
+{% if autopilot_cluster != true %}
 output "mesh_certificates_config" {
   description = "Mesh certificates configuration"
   value       = local.cluster_mesh_certificates_config
   depends_on = [
     google_container_cluster.primary
   ]
 }
+{% endif %}
+
 {% if private_cluster %}
 
 output "master_ipv4_cidr_block" {

diff --git a/modules/beta-autopilot-private-cluster/README.md b/modules/beta-autopilot-private-cluster/README.md
@@ -158,7 +158,6 @@ Then perform the following commands on the root folder:
 | master\_authorized\_networks\_config | Networks from which access to master is permitted |
 | master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
-| mesh\_certificates\_config | Mesh certificates configuration |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
 | name | Cluster name |

diff --git a/modules/beta-autopilot-private-cluster/outputs.tf b/modules/beta-autopilot-private-cluster/outputs.tf
@@ -142,13 +142,7 @@ output "identity_namespace" {
   ]
 }
 
-output "mesh_certificates_config" {
-  description = "Mesh certificates configuration"
-  value       = local.cluster_mesh_certificates_config
-  depends_on = [
-    google_container_cluster.primary
-  ]
-}
+
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"

diff --git a/modules/beta-autopilot-public-cluster/README.md b/modules/beta-autopilot-public-cluster/README.md
@@ -146,7 +146,6 @@ Then perform the following commands on the root folder:
 | logging\_service | Logging service used |
 | master\_authorized\_networks\_config | Networks from which access to master is permitted |
 | master\_version | Current master kubernetes version |
-| mesh\_certificates\_config | Mesh certificates configuration |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
 | name | Cluster name |

diff --git a/modules/beta-autopilot-public-cluster/outputs.tf b/modules/beta-autopilot-public-cluster/outputs.tf
@@ -142,13 +142,7 @@ output "identity_namespace" {
   ]
 }
 
-output "mesh_certificates_config" {
-  description = "Mesh certificates configuration"
-  value       = local.cluster_mesh_certificates_config
-  depends_on = [
-    google_container_cluster.primary
-  ]
-}
+
 
 output "cloudrun_enabled" {
   description = "Whether CloudRun enabled"

diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
   value       = var.master_ipv4_cidr_block

diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
   value       = var.master_ipv4_cidr_block

diff --git a/modules/beta-public-cluster-update-variant/outputs.tf b/modules/beta-public-cluster-update-variant/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "cloudrun_enabled" {
   description = "Whether CloudRun enabled"
   value       = local.cluster_cloudrun_enabled

diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "cloudrun_enabled" {
   description = "Whether CloudRun enabled"
   value       = local.cluster_cloudrun_enabled

diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
   value       = var.master_ipv4_cidr_block

diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -169,6 +169,7 @@ output "mesh_certificates_config" {
   ]
 }
 
+
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
   value       = var.master_ipv4_cidr_block

diff --git a/outputs.tf b/outputs.tf
@@ -168,3 +168,4 @@ output "mesh_certificates_config" {
     google_container_cluster.primary
   ]
 }
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,6 +169,7 @@ output "mesh_certificates_config" { @@
       ]
     }
     output "master_ipv4_cidr_block" {
       description = "The IP range in CIDR notation used for the hosted master network"
       value       = var.master_ipv4_cidr_block
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -168,3 +168,4 @@ output "mesh_certificates_config" {
		google_container_cluster.primary
		]
		}