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 32c343d fixed typo
32c343d is described below
commit 32c343d268e667cff06e9962b92db80045116a0c
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Sep 11 15:24:21 2019 +0300
fixed typo
---
.../terraform/gcp/ssn-gke/main/main.tf | 21 +++++++++++++++++++++
.../terraform/gcp/ssn-gke/main/modules/gke/gke.tf | 2 +-
.../gcp/ssn-gke/main/modules/helm_charts/main.tf | 21 ---------------------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index a5b1472..e193ea5 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -26,6 +26,27 @@ provider "google" {
zone = var.zone
}
+provider "helm" {
+
+ kubernetes {
+ host = module.gke_cluster.k8s_gke_endpoint
+ token = module.gke_cluster.k8s_gke_client_access_token
+ client_certificate =
base64decode(module.gke_cluster.k8s_gke_clinet_cert)
+ client_key =
base64decode(module.gke_cluster.k8s_gke_client_key)
+ cluster_ca_certificate =
base64decode(module.gke_cluster.k8s_gke_cluster_ca)
+ }
+ install_tiller = true
+ service_account = "tiller"
+}
+
+provider "kubernetes" {
+ host = module.gke_cluster.k8s_gke_endpoint
+
+ client_certificate = base64decode(module.gke_cluster.k8s_gke_clinet_cert)
+ client_key = base64decode(module.gke_cluster.k8s_gke_client_key)
+ cluster_ca_certificate = base64decode(module.gke_cluster.k8s_gke_cluster_ca)
+}
+
module "gke_cluster" {
source = "./modules/gke"
additional_tag = var.additional_tag
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
index d28fada..0e4225f 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/gke/gke.tf
@@ -92,7 +92,7 @@ resource "google_container_node_pool" "ssn_k8s_gke_node_pool"
{
]
}
provisioner "local-exec" {
- command = "sleep 600"
+ command = "sleep 300"
}
}
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 106b02a..3f18500 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
@@ -19,27 +19,6 @@
#
#
******************************************************************************
-provider "helm" {
-
- kubernetes {
- host = var.k8s_gke_endpoint
- 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)
- }
- install_tiller = true
- service_account = "tiller"
-}
-
-provider "kubernetes" {
- host = var.k8s_gke_endpoint
-
- 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)
-}
-
//resource "kubernetes_service_account" "example" {
// metadata {
// name = "tiller"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
