You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/11/12 16:22:29 UTC
[incubator-dlab] branch DLAB-1158 updated: added step certs
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 3d4f6ef added step certs
3d4f6ef is described below
commit 3d4f6ef7bdc2917a87fef9040a77faf94b7ccf53
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Nov 12 18:22:16 2019 +0200
added step certs
---
.../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf | 3 ++-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf | 3 ++-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
index 36f094d..f86ad43 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
@@ -36,7 +36,7 @@ data "template_file" "dlab_ui_values" {
resource "helm_release" "dlab_ui" {
name = "dlab-ui"
chart = "./modules/helm_charts/dlab-ui-chart"
- depends_on = [helm_release.mongodb, kubernetes_secret.mongo_db_password_secret]
+ depends_on = [helm_release.mongodb, kubernetes_secret.mongo_db_password_secret] #, null_resource.step_ca_issuer_delay]
namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
wait = true
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
index 3f3af55..383be72 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
@@ -67,7 +67,8 @@ resource "helm_release" "keycloak" {
values = [
data.template_file.keycloak_values.rendered
]
- depends_on = [helm_release.keycloak-mysql, kubernetes_secret.keycloak_password_secret]
+ depends_on = [helm_release.keycloak-mysql, kubernetes_secret.keycloak_password_secret, helm_release.nginx,
+ helm_release.dlab_ui]
}
resource "kubernetes_ingress" "keycloak_ingress" {
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
index 0d57394..e40ca00 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
@@ -37,7 +37,8 @@ resource "helm_release" "keycloak-mysql" {
values = [
data.template_file.mysql_values.rendered
]
- depends_on = [kubernetes_secret.mysql_root_password_secret, kubernetes_secret.mysql_user_password_secret]
+ depends_on = [kubernetes_secret.mysql_root_password_secret, kubernetes_secret.mysql_user_password_secret,
+ helm_release.nginx]
}
//resource "kubernetes_persistent_volume" "example" {
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
index 894fe44..061a8da 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
@@ -24,6 +24,7 @@ resource "helm_release" "nginx" {
chart = "stable/nginx-ingress"
namespace = kubernetes_namespace.dlab-namespace.metadata[0].name
wait = true
+ depends_on = [null_resource.step_ca_delay]
values = [
file("./modules/helm_charts/files/nginx_values.yaml")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org