[DLAB-773] Bugfixing
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/auto_scaling_groups.tf b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/auto_scaling_groups.tf
index 863e9fb..e97cc66 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/auto_scaling_groups.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/auto_scaling_groups.tf
@@ -1,4 +1,4 @@
-# *****************************************************************************
+#******************************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -26,7 +26,7 @@
ssn_k8s_ag_masters_name = "${var.service_base_name}-ssn-masters"
ssn_k8s_ag_workers_name = "${var.service_base_name}-ssn-workers"
ssn_k8s_masters_igm = "${var.service_base_name}-ssn-igm-masters"
- ssn_k8s_slaves_igm = "${var.service_base_name}-ssn-igm-slves"
+ ssn_k8s_workers_igm = "${var.service_base_name}-ssn-igm-workers"
}
resource "random_string" "ssn_keystore_password" {
@@ -38,7 +38,7 @@
length = 16
special = false
}
-
+/*
data "template_file" "ssn_k8s_masters_user_data" {
template = file("./files/masters-user-data.sh")
vars = {
@@ -53,10 +53,11 @@
endpoint_elastic_ip = google_compute_address.k8s-endpoint-eip.address
}
}
-
+*/
resource "google_compute_autoscaler" "master_group" {
name = local.ssn_k8s_ag_masters_name
- target = ""
+ zone = var.zone
+ target = google_compute_instance_group_manager.masters_igm
autoscaling_policy {
max_replicas = var.ssn_k8s_masters_count
min_replicas = var.ssn_k8s_masters_count
@@ -71,9 +72,11 @@
}
network_interface {
network = var.vpc_id
- subnetwork = compact([data.google_compute_subnetwork.k8s-subnet-a-data.name, data.google_compute_subnetwork.k8s-subnet-b-data.name, local.subnet_c_id])
+ subnetwork = var.subnet_id_a
}
+ tags = [var.ssn_net_tag]
+
service_account {
email = google_service_account.ssn_k8s_sa.email
scopes = ["https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/compute"]
@@ -91,22 +94,23 @@
name = local.ssn_k8s_masters_igm
zone = var.zone
- instance_template = google_compute_instance_template.masters_template.self_link
+ instance_template = ""
- target_pools = ["${google_compute_target_pool.ssn_target_pool.self_link}"]
+ target_pools = [google_compute_target_pool.ssn_target_pool.self_link]
base_instance_name = "autoscaler-sample"
}
-resource "google_compute_autoscaler" "master_group" {
- name = local.ssn_k8s_ag_masters_name
- target = ""
+resource "google_compute_autoscaler" "workers_group" {
+ name = local.ssn_k8s_ag_workers_name
+ zone = var.zone
+ target = google_compute_instance_group_manager.workers_igm
autoscaling_policy {
- max_replicas = var.ssn_k8s_masters_count
- min_replicas = var.ssn_k8s_masters_count
+ max_replicas = var.ssn_k8s_workers_count
+ min_replicas = var.ssn_k8s_workers_count
}
}
-resource "google_compute_instance_template" "slaves_template" {
+resource "google_compute_instance_template" "workers_template" {
name = local.ssn_k8s_launch_conf_masters_name
machine_type = var.ssn_k8s_masters_shape
disk {
@@ -114,28 +118,31 @@
}
network_interface {
network = var.vpc_id
- subnetwork = compact([data.google_compute_subnetwork.k8s-subnet-a-data.name, data.google_compute_subnetwork.k8s-subnet-b-data.name, local.subnet_c_id])
+ subnetwork = var.subnet_id_b
}
+ tags = [var.ssn_net_tag]
+
service_account {
email = google_service_account.ssn_k8s_sa.email
scopes = ["https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/compute"]
}
}
-resource "google_compute_instance_group_manager" "slaves_igm" {
+resource "google_compute_instance_group_manager" "workers_igm" {
provider = "google-beta"
- name = local.ssn_k8s_slaves_igm
+ name = local.ssn_k8s_workers_igm
zone = var.zone
- instance_template = google_compute_instance_template.slaves_template.self_link
+ instance_template = ""
- target_pools = ["${google_compute_target_pool.ssn_target_pool.self_link}"]
+ target_pools = [google_compute_target_pool.ssn_target_pool.self_link]
base_instance_name = "autoscaler-sample"
}
provider "google-beta"{
+ version = "2.13.0"
region = var.region
zone = var.zone
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/lb.tf b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/lb.tf
index efff90e..85e150f 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/lb.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/lb.tf
@@ -30,12 +30,11 @@
resource "google_compute_forwarding_rule" "ssn_k8s_nlb" {
name = local.ssn_nlb_name
- backend_service = google_compute_backend_service
+ backend_service = google_compute_backend_service.nlb_service.self_link
target = google_compute_target_pool.ssn_target_pool.self_link
ports = ["8443", "6443"]
load_balancing_scheme = "INTERNAL"
- network = google_compute_network.ssn_k8s_vpc.name
- subnetwork = compact([data.google_compute_subnetwork.k8s-subnet-a-data.name, data.google_compute_subnetwork.k8s-subnet-b-data.name, local.subnet_c_id])
+ network = google_compute_network.ssn_k8s_vpc.0.name
}
resource "google_compute_backend_service" "nlb_service" {
@@ -95,12 +94,3 @@
timeout_sec = 1
}
-resource "google_compute_global_forwarding_rule" "ssn_k8s_alb" {
- name = local.ssn_alb_name
- target = google_compute_target_http_proxy.http[0].self_link
- ip_address = google_compute_global_address.default.address
- port_range = "80"
-
-
-}
-
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/main.tf
index 6feb9f9..b644519 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/main.tf
@@ -20,6 +20,7 @@
# ******************************************************************************
provider "google" {
+ version = "2.13.0"
credentials = var.credentials
project = var.gcp_project_id
region = var.region
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/security_groups.tf b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/security_groups.tf
index b2d9243..df9b3b8 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/security_groups.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-k8s/main/security_groups.tf
@@ -51,7 +51,6 @@
protocol = "all"
}
target_tags = ["${var.ssn_net_tag}"]
- destination_ranges = ["0.0.0.0/0"]
}
resource "google_compute_firewall" "ssn_k8s_egress" {
