CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-17 04:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix overly strict firewall for GCP "worker pools"

Browse Source 
* Fix issue where worker firewall rules didn't apply to
additional workers attached to a GCP cluster using the new
"worker pools" feature (unreleased, #148). Solves host
connection timeouts and pods not being scheduled to attached
worker pools.
* Add `name` field to GCP internal worker module to represent
the unique name of of the worker pool
* Use `cluster_name` field of GCP internal worker module for
passing the name of the cluster to which workers should be
attached
This commit is contained in:
Dalton Hubble
2018-03-03 16:21:38 -08:00
parent da6aafe816
commit 45b556c08f
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
google-cloud/container-linux/kubernetes/workers/workers.tf
View File

@ -1,11 +1,11 @@
# Regional managed instance group maintains a homogeneous set of workers that
# span the zones in the region.
resource "google_compute_region_instance_group_manager" "workers" {
name = "${var.cluster_name}-worker-group"
description = "Compute instance group of ${var.cluster_name} workers"
name = "${var.name}-worker-group"
description = "Compute instance group of ${var.name} workers"
# instance name prefix for instances in the group
base_instance_name = "${var.cluster_name}-worker"
base_instance_name = "${var.name}-worker"
instance_template = "${google_compute_instance_template.worker.self_link}"
region = "${var.region}"
@ -35,7 +35,7 @@ data "ct_config" "worker_ign" {
}
resource "google_compute_instance_template" "worker" {
name_prefix = "${var.cluster_name}-worker-"
name_prefix = "${var.name}-worker-"
description = "Worker Instance template"
machine_type = "${var.machine_type}"
@ -64,7 +64,7 @@ resource "google_compute_instance_template" "worker" {
can_ip_forward = true
tags = ["worker", "${var.cluster_name}-worker"]
tags = ["worker", "${var.cluster_name}-worker", "${var.name}-worker"]
lifecycle {
# To update an Instance Template, Terraform should replace the existing resource