This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new f0b761a added step-ca
f0b761a is described below
commit f0b761ad2dfd231639a105cde5d5698cd48eaca5
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Dec 6 15:55:02 2019 +0200
added step-ca
---
infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf | 1 +
.../terraform/gcp/ssn-gke/main/modules/gke/outputs.tf | 4 ++++
.../terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf | 3 +++
.../terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf | 2 ++
4 files changed, 10 insertions(+)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index c1fe060..45c6483 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -75,4 +75,5 @@ module "helm_charts" {
custom_key_path = var.custom_key_path
mysql_disk_size = var.mysql_disk_size
domain = var.domain
+ node_pool = module.gke_cluster.node_pool
}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
index 340847c..2d2ab89 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
@@ -37,4 +37,8 @@ output "vpc_name" {
output "subnet_name" {
value = data.google_compute_subnetwork.ssn_gke_subnet_data.name
+}
+
+output "node_pool" {
+ value = google_container_node_pool.ssn_k8s_gke_node_pool.name
}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
index 1f5906e..f78f34b 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/cert-manager.tf
@@ -23,6 +23,9 @@ resource "null_resource" "crd_delay" {
provisioner "local-exec" {
command = "sleep 120"
}
+ triggers = {
+ "after" = var.node_pool
+ }
}
data "template_file" "cert_manager_values" {
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
index c9d3382..483a342 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
@@ -82,3 +82,5 @@ variable "custom_certs_host" {}
variable "mysql_disk_size" {}
variable "domain" {}
+
+variable "node_pool" {}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
