Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing Interpolation-only expressions #1317

Merged
merged 2 commits into from
Feb 5, 2020
Merged

Removing Interpolation-only expressions #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b178da
Removing Interpolation-only expressions
chrisst Feb 4, 2020
2924517
Merge branch 'master' into terraform-module-syntax
pooneh-m Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions install/terraform/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ variable "ports" {
# It is crucial to set valid ProjectID for "project".
variable "cluster" {
description = "Set of GKE cluster parameters."
type = "map"
type = map

default = {
"zone" = "us-west1-c"
Expand All @@ -47,29 +47,29 @@ variable "cluster" {
# Run `terraform taint null_resource.test-setting-variables` before second execution
resource "null_resource" "test-setting-variables" {
provisioner "local-exec" {
command = "${"${format("echo Current variables set as following - name: %s, project: %s, machineType: %s, initialNodeCount: %s, zone: %s",
"${var.cluster["name"]}", "${var.cluster["project"]}",
"${var.cluster["machineType"]}", "${var.cluster["initialNodeCount"]}",
"${var.cluster["zone"]}")}"}"
command = format("echo Current variables set as following - name: %s, project: %s, machineType: %s, initialNodeCount: %s, zone: %s",
var.cluster["name"], var.cluster["project"],
var.cluster["machineType"], var.cluster["initialNodeCount"],
var.cluster["zone"])
}
}

resource "google_container_cluster" "primary" {
name = "${var.cluster["name"]}"
location = "${var.cluster["zone"]}"
project = "${var.cluster["project"]}"
provider = "google-beta"
name = var.cluster["name"]
location = var.cluster["zone"]
project = var.cluster["project"]
provider = google-beta

node_pool {
name = "default"
node_count = "${var.cluster["initialNodeCount"]}"
node_count = var.cluster["initialNodeCount"]

management {
auto_upgrade = false
}

node_config {
machine_type = "${var.cluster["machineType"]}"
machine_type = var.cluster["machineType"]

oauth_scopes = [
"https://www.googleapis.com/auth/devstorage.read_only",
Expand Down Expand Up @@ -156,22 +156,22 @@ resource "google_container_cluster" "primary" {

resource "google_compute_firewall" "default" {
name = "game-server-firewall-firewall-${var.cluster["name"]}"
project = "${var.cluster["project"]}"
network = "${google_compute_network.default.name}"
project = var.cluster["project"]
network = google_compute_network.default.name

allow {
protocol = "udp"
ports = ["${var.ports}"]
ports = [var.ports]
}

source_tags = ["game-server"]
}

resource "google_compute_network" "default" {
project = "${var.cluster["project"]}"
project = var.cluster["project"]
name = "agones-network-${var.cluster["name"]}"
}

output "cluster_ca_certificate" {
value = "${google_container_cluster.primary.master_auth.0.cluster_ca_certificate}"
value = google_container_cluster.primary.master_auth.0.cluster_ca_certificate
}
46 changes: 23 additions & 23 deletions install/terraform/helm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ resource "kubernetes_service_account" "tiller" {
namespace = "kube-system"
}

depends_on = ["google_container_cluster.primary"]
depends_on = [google_container_cluster.primary]

automount_service_account_token = true
}

resource "kubernetes_cluster_role_binding" "tiller" {
depends_on = ["kubernetes_service_account.tiller"]
depends_on = [kubernetes_service_account.tiller]

metadata {
name = "tiller"
Expand Down Expand Up @@ -91,30 +91,30 @@ provider "kubernetes" {
version = "~> 1.5"
load_config_file = false
host = "https://${google_container_cluster.primary.endpoint}"
token = "${data.google_client_config.default.access_token}"
cluster_ca_certificate = "${base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)
}

provider "helm" {
version = "~> 0.9"

debug = true
install_tiller = true
service_account = "${kubernetes_service_account.tiller.metadata.0.name}"
service_account = kubernetes_service_account.tiller.metadata.0.name
tiller_image = "gcr.io/kubernetes-helm/tiller:v2.14.2"

kubernetes {
load_config_file = false
host = "https://${google_container_cluster.primary.endpoint}"
token = "${data.google_client_config.default.access_token}"
cluster_ca_certificate = "${base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)
}
}

data "google_client_config" "current" {}

data "helm_repository" "agones" {
depends_on = ["kubernetes_cluster_role_binding.tiller"]
depends_on = [kubernetes_cluster_role_binding.tiller]
name = "agones"
url = "https://agones.dev/chart/stable"
}
Expand All @@ -126,63 +126,63 @@ locals {
}

resource "helm_release" "agones" {
depends_on = ["null_resource.helm_init", "kubernetes_cluster_role_binding.tiller"]
depends_on = [null_resource.helm_init, kubernetes_cluster_role_binding.tiller]
name = "agones"
force_update = "true"
repository = "${data.helm_repository.agones.metadata.0.name}"
chart = "${var.chart}"
repository = data.helm_repository.agones.metadata.0.name
chart = var.chart
timeout = 420

values = [
"${length(var.values_file) == 0 ? "" : file("${var.values_file}")}",
length(var.values_file) == 0 ? "" : file(var.values_file),
]

set {
name = "crds.CleanupOnDelete"
value = "${var.crd_cleanup}"
value = var.crd_cleanup
}

set {
name = "${local.tag_name}"
value = "${var.agones_version}"
name = local.tag_name
value = var.agones_version
}

set {
name = "agones.image.registry"
value = "${var.image_registry}"
value = var.image_registry
}

set {
name = "agones.image.controller.pullPolicy"
value = "${var.pull_policy}"
value = var.pull_policy
}

set {
name = "agones.image.sdk.alwaysPull"
value = "${var.always_pull_sidecar}"
value = var.always_pull_sidecar
}

set {
name = "agones.image.controller.pullSecret"
value = "${var.image_pull_secret}"
value = var.image_pull_secret
}

set {
name = " agones.ping.http.serviceType"
value = "${var.ping_service_type}"
value = var.ping_service_type
}

set {
name = "agones.ping.udp.serviceType"
value = "${var.ping_service_type}"
value = var.ping_service_type
}

set {
name = " agones.allocator.http.serviceType"
value = "${var.allocator_service_type}"
value = var.allocator_service_type
}

version = "${var.agones_version}"
version = var.agones_version
namespace = "agones-system"

}
Expand Down
33 changes: 19 additions & 14 deletions install/terraform/modules/gke/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.


terraform {
required_version = ">= 0.12.6"
}

provider "google-beta" {
version = "~> 2.10"
zone = "${var.cluster["zone"]}"
Expand All @@ -27,26 +32,26 @@ data "google_client_config" "default" {}
# Run `terraform taint null_resource.test-setting-variables` before second execution
resource "null_resource" "test-setting-variables" {
provisioner "local-exec" {
command = "${"${format("echo Current variables set as following - name: %s, project: %s, machineType: %s, initialNodeCount: %s, zone: %s",
"${var.cluster["name"]}", "${var.cluster["project"]}",
"${var.cluster["machineType"]}", "${var.cluster["initialNodeCount"]}",
"${var.cluster["zone"]}")}"}"
command = "${format("echo Current variables set as following - name: %s, project: %s, machineType: %s, initialNodeCount: %s, zone: %s",
var.cluster["name"], var.cluster["project"],
var.cluster["machineType"], var.cluster["initialNodeCount"],
var.cluster["zone"])"
}
}
resource "google_container_cluster" "primary" {
name = "${var.cluster["name"]}"
location = "${var.cluster["zone"]}"
project = "${var.cluster["project"]}"
provider = "google-beta"
name = var.cluster["name"]
location = var.cluster["zone"]
project = var.cluster["project"]
provider = google-beta

min_master_version = "1.13"

node_pool {
name = "default"
node_count = "${var.cluster["initialNodeCount"]}"
node_count = var.cluster["initialNodeCount"]

node_config {
machine_type = "${var.cluster["machineType"]}"
machine_type = var.cluster["machineType"]

oauth_scopes = [
"https://www.googleapis.com/auth/devstorage.read_only",
Expand Down Expand Up @@ -122,18 +127,18 @@ resource "google_container_cluster" "primary" {

resource "google_compute_firewall" "default" {
name = "game-server-firewall-firewall-${var.cluster["name"]}"
project = "${var.cluster["project"]}"
network = "${google_compute_network.default.name}"
project = var.cluster["project"]
network = google_compute_network.default.name

allow {
protocol = "udp"
ports = ["${var.ports}"]
ports = [var.ports]
}

source_tags = ["game-server"]
}

resource "google_compute_network" "default" {
project = "${var.cluster["project"]}"
project = var.cluster["project"]
name = "agones-network-${var.cluster["name"]}"
}
4 changes: 2 additions & 2 deletions install/terraform/modules/gke/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
# limitations under the License.

output "cluster_ca_certificate" {
value = "${base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)}"
value = base64decode(google_container_cluster.primary.master_auth.0.cluster_ca_certificate)
}

output "host" {
value = "https://${google_container_cluster.primary.endpoint}"
}

output "token" {
value = "${data.google_client_config.default.access_token}"
value = data.google_client_config.default.access_token
}