This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new 8cad265 fixed typo
8cad265 is described below
commit 8cad26572856dfc7d40d2b937d3a4fe239a2914e
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Sep 11 10:40:18 2019 +0300
fixed typo
---
.../terraform/gcp/ssn-gke/main/main.tf | 7 ++++++-
.../terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf | 4 ++--
.../terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf | 11 +----------
.../gcp/ssn-gke/main/modules/helm_charts/variables.tf | 10 ++++++++++
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index 8222003..a5b1472 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -26,7 +26,7 @@ provider "google" {
zone = var.zone
}
-module "gke" {
+module "gke_cluster" {
source = "./modules/gke"
additional_tag = var.additional_tag
service_base_name = var.service_base_name
@@ -69,4 +69,9 @@ module "helm_charts" {
mongo_node_port = var.mongo_node_port
ssn_keystore_password = var.ssn_keystore_password
endpoint_keystore_password = var.endpoint_keystore_password
+ k8s_gke_endpoint = module.gke_cluster.k8s_gke_endpoint
+ k8s_gke_clinet_cert = module.gke_cluster.k8s_gke_clinet_cert
+ k8s_gke_client_key = module.gke_cluster.k8s_gke_client_key
+ k8s_gke_cluster_ca = module.gke_cluster.k8s_gke_cluster_ca
+ access_token = module.gke_cluster.k8s_gke_client_access_token
}
\ No newline at end of file
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 e0d409f..e776fb4 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
@@ -20,7 +20,7 @@
#
******************************************************************************
data "template_file" "dlab_ui_values" {
- template = file("./dlab-ui-chart/values.yaml")
+ template = file("./modules/helm_charts/dlab-ui-chart/values.yaml")
vars = {
mongo_db_name = var.mongo_dbname
mongo_user = var.mongo_db_username
@@ -40,7 +40,7 @@ data "template_file" "dlab_ui_values" {
resource "helm_release" "dlab_ui" {
name = "dlab-ui"
- chart = "./dlab-ui-chart"
+ chart = "./modules/helm_charts/dlab-ui-chart"
depends_on = [helm_release.mongodb,
kubernetes_secret.mongo_db_password_secret]
wait = true
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
index 139cf7e..106b02a 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
@@ -23,7 +23,7 @@ provider "helm" {
kubernetes {
host = var.k8s_gke_endpoint
- token = data.google_client_config.current.access_token
+ token = var.access_token
client_certificate = base64decode(var.k8s_gke_clinet_cert)
client_key = base64decode(var.k8s_gke_client_key)
cluster_ca_certificate = base64decode(var.k8s_gke_cluster_ca)
@@ -32,13 +32,6 @@ provider "helm" {
service_account = "tiller"
}
-provider "google" {
- credentials = file(var.credentials_file_path)
- project = var.project_id
- region = var.region
- zone = var.zone
-}
-
provider "kubernetes" {
host = var.k8s_gke_endpoint
@@ -71,8 +64,6 @@ provider "kubernetes" {
// }
//}
-data "google_client_config" "current" {}
-
output "keycloak_client_secret" {
value = random_uuid.keycloak_client_secret.result
}
\ No newline at end of file
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 af89add..c532bf6 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
@@ -70,6 +70,16 @@ variable "mongo_node_port" {}
variable "ssn_keystore_password" {}
variable "endpoint_keystore_password" {}
+
+variable "k8s_gke_endpoint" {}
+
+variable "k8s_gke_clinet_cert" {}
+
+variable "k8s_gke_client_key" {}
+
+variable "k8s_gke_cluster_ca" {}
+
+variable "access_token" {}
//variable "nginx_http_port" {
// default = "31080"
// description = "Sets the nodePort that maps to the Ingress' port 80"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
