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/09/10 16:56:10 UTC
[incubator-dlab] branch DLAB-1086 updated: modified terraform
scripts structure
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 1b9d816 modified terraform scripts structure
1b9d816 is described below
commit 1b9d816a53ceb7c8db98807a00205e42ffc775ef
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 10 19:56:01 2019 +0300
modified terraform scripts structure
---
.../terraform/gcp/ssn-gke/main/main.tf | 55 +++++++---
.../gcp/ssn-gke/main/{ => modules/gke}/gke.tf | 30 ++----
.../gcp/ssn-gke/main/{ => modules/gke}/iam.tf | 0
.../main/{main.tf => modules/gke/outputs.tf} | 33 +++---
.../main/modules/gke/variables.tf} | 32 +++---
.../gcp/ssn-gke/main/{ => modules/gke}/vpc.tf | 0
.../modules/helm_charts}/dlab-ui-chart/.helmignore | 0
.../modules/helm_charts}/dlab-ui-chart/Chart.yaml | 0
.../helm_charts}/dlab-ui-chart/templates/NOTES.txt | 0
.../dlab-ui-chart/templates/_helpers.tpl | 0
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 0
.../dlab-ui-chart/templates/deployment.yaml | 0
.../dlab-ui-chart/templates/ingress.yaml | 0
.../dlab-ui-chart/templates/service.yaml | 0
.../modules/helm_charts}/dlab-ui-chart/values.yaml | 0
.../main/modules/helm_charts}/dlab-ui.tf | 0
.../helm_charts}/files/configure_keycloak.sh | 0
.../files/dlab/login/resources/css/login.css | 0
.../files/dlab/login/resources/img/favicon.ico | Bin
.../resources/img/feedback-error-arrow-down.png | Bin
.../login/resources/img/feedback-error-sign.png | Bin
.../resources/img/feedback-success-arrow-down.png | Bin
.../login/resources/img/feedback-success-sign.png | Bin
.../resources/img/feedback-warning-arrow-down.png | Bin
.../login/resources/img/feedback-warning-sign.png | Bin
.../dlab/login/resources/img/keycloak-logo.png | Bin
.../dlab/login/resources/img/login-background.png | Bin
.../files/dlab/login/resources/img/login-icons.png | Bin
.../files/dlab/login/resources/img/logo.png | Bin
.../helm_charts}/files/dlab/login/theme.properties | 0
.../helm_charts}/files/keycloak_values.yaml | 0
.../modules/helm_charts}/files/mongo_values.yaml | 0
.../modules/helm_charts}/files/mysql_values.yaml | 0
.../modules/helm_charts}/files/nginx_values.yaml | 0
.../main/modules/helm_charts}/keycloak.tf | 0
.../main/modules/helm_charts}/main.tf | 1 +
.../main/modules/helm_charts}/mongo.tf | 0
.../main/modules/helm_charts}/mysql.tf | 0
.../main/modules/helm_charts}/nginx.tf | 0
.../main/modules/helm_charts/outputs.tf} | 9 +-
.../main/modules/helm_charts}/secrets.tf | 0
.../main/modules/helm_charts}/variables.tf | 111 +++++----------------
.../nginx_values.yaml => ssn-gke/main/outputs.tf} | 6 --
.../terraform/gcp/ssn-gke/main/variables.tf | 99 +++++++++++++++++-
44 files changed, 211 insertions(+), 165 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index c80b146..8222003 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -26,20 +26,47 @@ provider "google" {
zone = var.zone
}
-resource "random_string" "ssn_keystore_password" {
- length = 16
- special = false
+module "gke" {
+ source = "./modules/gke"
+ additional_tag = var.additional_tag
+ service_base_name = var.service_base_name
+ region = var.region
+ gke_cluster_version = var.gke_cluster_version
+ ssn_k8s_workers_count = var.ssn_k8s_workers_count
+ ssn_k8s_workers_shape = var.ssn_k8s_workers_shape
+ project_id = var.project_id
+ service_account_iam_roles = var.service_account_iam_roles
+ vpc_name = var.vpc_name
+ subnet_name = var.subnet_name
+ subnet_cidr = var.subnet_cidr
}
-resource "random_string" "endpoint_keystore_password" {
- length = 16
- special = false
-}
-
-output "ssn_keystore_password" {
- value = random_string.ssn_keystore_password.result
-}
-
-output "endpoint_keystore_password" {
- value = random_string.endpoint_keystore_password.result
+module "helm_charts" {
+ source = "./modules/helm_charts"
+ mongo_dbname = var.mongo_dbname
+ mongo_db_username = var.mongo_db_username
+ mongo_service_port = var.mongo_service_port
+ mongo_service_name = var.mongo_service_name
+ ssn_k8s_alb_dns_name = var.ssn_k8s_alb_dns_name
+ env_os = var.env_os
+ service_base_name = var.service_base_name
+ ldap_host = var.ldap_host
+ ldap_dn = var.ldap_dn
+ ldap_users_group = var.ldap_users_group
+ ldap_user = var.ldap_user
+ ldap_bind_creds= var.ldap_bind_creds
+ keycloak_user = var.keycloak_user
+ ldap_usernameAttr = var.ldap_usernameAttr
+ ldap_rdnAttr = var.ldap_rdnAttr
+ ldap_uuidAttr = var.ldap_uuidAttr
+ mysql_db_name = var.mysql_db_name
+ mysql_user = var.mysql_user
+ credentials_file_path = var.credentials_file_path
+ project_id = var.project_id
+ region = var.region
+ zone = var.zone
+ mongo_image_tag = var.mongo_image_tag
+ mongo_node_port = var.mongo_node_port
+ ssn_keystore_password = var.ssn_keystore_password
+ endpoint_keystore_password = var.endpoint_keystore_password
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
similarity index 84%
rename from infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
index ab1a535..24024e5 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/gke.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
@@ -25,6 +25,16 @@ locals {
gke_node_pool_name = "${var.service_base_name}-node-pool"
}
+resource "random_string" "ssn_keystore_password" {
+ length = 16
+ special = false
+}
+
+resource "random_string" "endpoint_keystore_password" {
+ length = 16
+ special = false
+}
+
resource "google_container_cluster" "ssn_k8s_gke_cluster" {
name = local.gke_name
location = var.region
@@ -89,24 +99,4 @@ data "google_container_cluster" "ssn_k8s_gke_cluster" {
depends_on = [google_container_cluster.ssn_k8s_gke_cluster]
}
-output "k8s_gke_endpoint" {
- value = data.google_container_cluster.ssn_k8s_gke_cluster.endpoint
-}
-
-output "k8s_gke_client_access_token" {
- value = data.google_client_config.current.access_token
-}
-
-output "k8s_gke_clinet_cert" {
- value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.client_certificate
-}
-
-output "k8s_gke_client_key" {
- value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.client_key
-}
-
-output "k8s_gke_cluster_ca" {
- value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.cluster_ca_certificate
-}
-
data "google_client_config" "current" {}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/iam.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/iam.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-gke/main/iam.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/iam.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
similarity index 67%
copy from infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
copy to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
index c80b146..7bcd372 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/outputs.tf
@@ -19,27 +19,30 @@
#
# ******************************************************************************
-provider "google" {
- credentials = file(var.credentials_file_path)
- project = var.project_id
- region = var.region
- zone = var.zone
+output "ssn_keystore_password" {
+ value = random_string.ssn_keystore_password.result
}
-resource "random_string" "ssn_keystore_password" {
- length = 16
- special = false
+output "endpoint_keystore_password" {
+ value = random_string.endpoint_keystore_password.result
}
-resource "random_string" "endpoint_keystore_password" {
- length = 16
- special = false
+output "k8s_gke_endpoint" {
+ value = data.google_container_cluster.ssn_k8s_gke_cluster.endpoint
}
-output "ssn_keystore_password" {
- value = random_string.ssn_keystore_password.result
+output "k8s_gke_client_access_token" {
+ value = data.google_client_config.current.access_token
}
-output "endpoint_keystore_password" {
- value = random_string.endpoint_keystore_password.result
+output "k8s_gke_clinet_cert" {
+ value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.client_certificate
+}
+
+output "k8s_gke_client_key" {
+ value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.client_key
+}
+
+output "k8s_gke_cluster_ca" {
+ value = google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.cluster_ca_certificate
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mongo_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf
similarity index 74%
copy from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mongo_values.yaml
copy to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf
index e4a95c7..d5e566a 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mongo_values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/variables.tf
@@ -19,21 +19,25 @@
#
# ******************************************************************************
-replicaSet:
- enabled: true
+variable "additional_tag" {}
-mongodbRootPassword: "${mongo_root_pwd}"
-mongodbUsername: ${mongo_db_username}
-mongodbDatabase: ${mongo_dbname}
-mongodbPassword: "${mongo_db_pwd}"
+variable "service_base_name" {}
-image:
- tag: ${mongo_image_tag}
+variable "region" {}
-persistence:
- enabled: false
+variable "gke_cluster_version" {}
+
+variable "ssn_k8s_workers_count" {}
+
+variable "ssn_k8s_workers_shape" {}
+
+variable "project_id" {}
+
+variable "service_account_iam_roles" {}
+
+variable "vpc_name" {}
+
+variable "subnet_name" {}
+
+variable "subnet_cidr" {}
-service:
- type: NodePort
- port: ${mongo_service_port}
- nodePort: ${mongo_node_port}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/vpc.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-gke/main/vpc.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/vpc.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/.helmignore b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/.helmignore
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/.helmignore
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/.helmignore
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/Chart.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/Chart.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/Chart.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/Chart.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/NOTES.txt
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/NOTES.txt
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/_helpers.tpl b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/_helpers.tpl
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/_helpers.tpl
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/_helpers.tpl
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/deployment.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/deployment.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/ingress.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/service.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui-chart/values.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/dlab-ui.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/configure_keycloak.sh b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/configure_keycloak.sh
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/css/login.css b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/css/login.css
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/css/login.css
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/css/login.css
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/favicon.ico b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/favicon.ico
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/favicon.ico
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/favicon.ico
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-error-arrow-down.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-error-arrow-down.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-error-arrow-down.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-error-arrow-down.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-error-sign.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-error-sign.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-error-sign.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-error-sign.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-success-arrow-down.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-success-arrow-down.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-success-arrow-down.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-success-arrow-down.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-success-sign.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-success-sign.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-success-sign.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-success-sign.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-warning-arrow-down.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-warning-arrow-down.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-warning-arrow-down.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-warning-arrow-down.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-warning-sign.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-warning-sign.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/feedback-warning-sign.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/feedback-warning-sign.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/keycloak-logo.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/keycloak-logo.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/keycloak-logo.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/keycloak-logo.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/login-background.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/login-background.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/login-background.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/login-background.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/login-icons.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/login-icons.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/login-icons.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/login-icons.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/logo.png b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/logo.png
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/resources/img/logo.png
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/resources/img/logo.png
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/theme.properties b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/theme.properties
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/dlab/login/theme.properties
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/dlab/login/theme.properties
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/keycloak_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/keycloak_values.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/keycloak_values.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mongo_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mongo_values.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mongo_values.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mongo_values.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mysql_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mysql_values.yaml
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/mysql_values.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/mysql_values.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
similarity index 100%
copy from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml
copy to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/nginx_values.yaml
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/keycloak.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/keycloak.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/keycloak.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
similarity index 99%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/main.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
index 36767a0..139cf7e 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
@@ -18,6 +18,7 @@
# under the License.
#
# ******************************************************************************
+
provider "helm" {
kubernetes {
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/mongo.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongo.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/mongo.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mongo.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/mysql.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/mysql.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/mysql.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/nginx.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/nginx.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/nginx.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
similarity index 89%
copy from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml
copy to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
index a4ac2f0..04cd33e 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
@@ -17,11 +17,4 @@
# specific language governing permissions and limitations
# under the License.
#
-# ******************************************************************************
-
-controller:
- service:
- nodePorts:
- http: 31080
- https: 31443
- type: NodePort
\ No newline at end of file
+# ******************************************************************************
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/secrets.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
similarity index 100%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/secrets.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/secrets.tf
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/variables.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
similarity index 51%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/variables.tf
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
index 682d2e6..af89add 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/variables.tf
@@ -19,120 +19,57 @@
#
# ******************************************************************************
-variable "k8s_gke_endpoint" {
- default = ""
-}
+variable "mongo_dbname" {}
-variable "k8s_gke_client_access_token" {
- default = ""
-}
+variable "mongo_db_username" {}
-variable "k8s_gke_clinet_cert" {
- default = ""
-}
+variable "mongo_service_port" {}
-variable "k8s_gke_client_key" {
- default = ""
-}
+variable "mongo_service_name" {}
-variable "k8s_gke_cluster_ca" {
- default = ""
-}
+variable "ssn_k8s_alb_dns_name" {}
-variable "ssn_k8s_alb_dns_name" {
- default = ""
-}
+variable "env_os" {}
-variable "keycloak_user" {
- default = "dlab-admin"
-}
+variable "service_base_name" {}
-variable "mysql_user" {
- default = "keycloak"
-}
+variable "ldap_host" {}
-variable "mysql_db_name" {
- default = "keycloak"
-}
+variable "ldap_dn" {}
-variable "ldap_usernameAttr" {
- default = "uid"
-}
+variable "ldap_users_group" {}
-variable "ldap_rdnAttr" {
- default = "uid"
-}
+variable "ldap_user" {}
-variable "ldap_uuidAttr" {
- default = "uid"
-}
+variable "ldap_bind_creds" {}
-variable "ldap_users_group" {
- default = "ou=People"
-}
+variable "keycloak_user" {}
-variable "ldap_dn" {
- default = "dc=example,dc=com"
-}
+variable "ldap_usernameAttr" {}
-variable "ldap_user" {
- default = "cn=admin"
-}
+variable "ldap_rdnAttr" {}
-variable "ldap_bind_creds" {
- default = ""
-}
+variable "ldap_uuidAttr" {}
-variable "ldap_host" {
- default = ""
-}
+variable "mysql_db_name" {}
-variable "mongo_db_username" {
- default = "admin"
-}
+variable "mysql_user" {}
-variable "mongo_dbname" {
- default = "dlabdb"
-}
+variable "credentials_file_path" {}
-variable "mongo_image_tag" {
- default = "4.0.10-debian-9-r13"
- description = "MongoDB Image tag"
-}
+variable "project_id" {}
-variable "mongo_service_port" {
- default = "27017"
-}
+variable "region" {}
-variable "mongo_node_port" {
- default = "31017"
-}
+variable "zone" {}
-variable "mongo_service_name" {
- default = "mongo-ha-mongodb"
-}
+variable "mongo_image_tag" {}
-variable "ssn_k8s_workers_count" {
- default = "2"
-}
+variable "mongo_node_port" {}
variable "ssn_keystore_password" {}
variable "endpoint_keystore_password" {}
-
-# variable "endpoint_eip_address" {}
-
-variable "service_base_name" {}
-
-variable "env_os" {}
-
-variable "credentials_file_path" {}
-
-variable "project_id" {}
-
-variable "region" {}
-
-variable "zone" {}
//variable "nginx_http_port" {
// default = "31080"
// description = "Sets the nodePort that maps to the Ingress' port 80"
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
similarity index 91%
rename from infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml
rename to infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
index a4ac2f0..39191b2 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-helm-charts/main/files/nginx_values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
@@ -19,9 +19,3 @@
#
# ******************************************************************************
-controller:
- service:
- nodePorts:
- http: 31080
- https: 31443
- type: NodePort
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
index 225dbd8..48043a0 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
@@ -80,4 +80,101 @@ variable "service_account_iam_roles" {
"roles/storage.objectViewer",
"roles/iam.serviceAccountTokenCreator",
]
-}
\ No newline at end of file
+}
+
+variable "k8s_gke_endpoint" {
+ default = ""
+}
+
+variable "k8s_gke_client_access_token" {
+ default = ""
+}
+
+variable "k8s_gke_clinet_cert" {
+ default = ""
+}
+
+variable "k8s_gke_client_key" {
+ default = ""
+}
+
+variable "k8s_gke_cluster_ca" {
+ default = ""
+}
+
+variable "ssn_k8s_alb_dns_name" {
+ default = ""
+}
+
+variable "keycloak_user" {
+ default = "dlab-admin"
+}
+
+variable "mysql_user" {
+ default = "keycloak"
+}
+
+variable "mysql_db_name" {
+ default = "keycloak"
+}
+
+variable "ldap_usernameAttr" {
+ default = "uid"
+}
+
+variable "ldap_rdnAttr" {
+ default = "uid"
+}
+
+variable "ldap_uuidAttr" {
+ default = "uid"
+}
+
+variable "ldap_users_group" {
+ default = "ou=People"
+}
+
+variable "ldap_dn" {
+ default = "dc=example,dc=com"
+}
+
+variable "ldap_user" {
+ default = "cn=admin"
+}
+
+variable "ldap_bind_creds" {
+ default = ""
+}
+
+variable "ldap_host" {
+ default = ""
+}
+
+variable "mongo_db_username" {
+ default = "admin"
+}
+
+variable "mongo_dbname" {
+ default = "dlabdb"
+}
+
+variable "mongo_image_tag" {
+ default = "4.0.10-debian-9-r13"
+ description = "MongoDB Image tag"
+}
+
+variable "mongo_service_port" {
+ default = "27017"
+}
+
+variable "mongo_node_port" {
+ default = "31017"
+}
+
+variable "mongo_service_name" {
+ default = "mongo-ha-mongodb"
+}
+
+# variable "endpoint_eip_address" {}
+
+variable "env_os" {}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org