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

Jump to bottom

Updates for Terraform #3293

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Updates for Terraform #3293

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
0d8f3ae
Updates for Terraform
markmandel Jul 28, 2023
79423a8
Merge branch 'main' into build/upgrade-terraform
agones-bot Jul 31, 2023
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
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ RUN echo "export PATH=/usr/local/go/bin:/go/bin/:\$PATH" >> /root/.bashrc
RUN echo "export EDITOR=nano" >> /root/.bashrc

# install terraform
RUN wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip && unzip ./terraform.zip && mv terraform /usr/local/bin/
RUN wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/1.5.4/terraform_1.5.4_linux_amd64.zip && unzip ./terraform.zip && mv terraform /usr/local/bin/

# code generation scripts
COPY *.sh /root/
Expand Down
68 changes: 36 additions & 32 deletions install/terraform/modules/gke/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,33 @@ data "google_client_config" "default" {}
# A list of all parameters used in interpolation var.cluster
# Set values to default if not key was not set in original map
locals {
project = lookup(var.cluster, "project", "agones")
location = lookup(var.cluster, "location", "us-west1-c")
zone = lookup(var.cluster, "zone", "")
name = lookup(var.cluster, "name", "test-cluster")
machineType = lookup(var.cluster, "machineType", "e2-standard-4")
initialNodeCount = lookup(var.cluster, "initialNodeCount", "4")
enableImageStreaming = lookup(var.cluster, "enableImageStreaming", true)
network = lookup(var.cluster, "network", "default")
subnetwork = lookup(var.cluster, "subnetwork", "")
releaseChannel = lookup(var.cluster, "releaseChannel", "UNSPECIFIED")
kubernetesVersion = lookup(var.cluster, "kubernetesVersion", "1.26")
windowsInitialNodeCount = lookup(var.cluster, "windowsInitialNodeCount", "0")
windowsMachineType = lookup(var.cluster, "windowsMachineType", "e2-standard-4")
autoscale = lookup(var.cluster, "autoscale", false)
workloadIdentity = lookup(var.cluster, "workloadIdentity", false)
minNodeCount = lookup(var.cluster, "minNodeCount", "1")
maxNodeCount = lookup(var.cluster, "maxNodeCount", "5")
maintenanceExclusionStartTime = lookup(var.cluster, "maintenanceExclusionStartTime", timestamp())
maintenanceExclusionEndTime = lookup(var.cluster, "maintenanceExclusionEndTime", timeadd(timestamp(), "4080h")) # 170 days
project = lookup(var.cluster, "project", "agones")
location = lookup(var.cluster, "location", "us-west1-c")
zone = lookup(var.cluster, "zone", "")
name = lookup(var.cluster, "name", "test-cluster")
machineType = lookup(var.cluster, "machineType", "e2-standard-4")
initialNodeCount = lookup(var.cluster, "initialNodeCount", "4")
enableImageStreaming = lookup(var.cluster, "enableImageStreaming", true)
network = lookup(var.cluster, "network", "default")
subnetwork = lookup(var.cluster, "subnetwork", "")
releaseChannel = lookup(var.cluster, "releaseChannel", "UNSPECIFIED")
kubernetesVersion = lookup(var.cluster, "kubernetesVersion", "1.26")
windowsInitialNodeCount = lookup(var.cluster, "windowsInitialNodeCount", "0")
windowsMachineType = lookup(var.cluster, "windowsMachineType", "e2-standard-4")
autoscale = lookup(var.cluster, "autoscale", false)
workloadIdentity = lookup(var.cluster, "workloadIdentity", false)
minNodeCount = lookup(var.cluster, "minNodeCount", "1")
maxNodeCount = lookup(var.cluster, "maxNodeCount", "5")
maintenanceExclusionStartTime = lookup(var.cluster, "maintenanceExclusionStartTime", timestamp())
maintenanceExclusionEndTime = lookup(var.cluster, "maintenanceExclusionEndTime", timeadd(timestamp(), "4080h"))
# 170 days
}

data "google_container_engine_versions" "version" {
project = local.project
provider = google-beta
location = local.location
version_prefix = format("%s.",local.kubernetesVersion)
version_prefix = format("%s.", local.kubernetesVersion)
}

# echo command used for debugging purpose
Expand Down Expand Up @@ -85,17 +86,20 @@ resource "google_container_cluster" "primary" {

min_master_version = local.kubernetesVersion

maintenance_policy {
# When exclusions and maintenance windows overlap, exclusions have precedence.
daily_maintenance_window {
start_time = "03:00"
}
maintenance_exclusion{
exclusion_name = format("%s-%s", local.name, "exclusion")
start_time = local.maintenanceExclusionStartTime
end_time = local.maintenanceExclusionEndTime
exclusion_options {
scope = "NO_MINOR_UPGRADES"
dynamic "maintenance_policy" {
for_each = local.releaseChannel != "UNSPECIFIED" ? [1] : []
content {
# When exclusions and maintenance windows overlap, exclusions have precedence.
daily_maintenance_window {
start_time = "03:00"
}
maintenance_exclusion {
exclusion_name = format("%s-%s", local.name, "exclusion")
start_time = local.maintenanceExclusionStartTime
end_time = local.maintenanceExclusionEndTime
exclusion_options {
scope = "NO_MINOR_UPGRADES"
}
}
}
}
Expand Down Expand Up @@ -245,7 +249,7 @@ resource "google_container_cluster" "primary" {
}
}
dynamic "workload_identity_config" {
for_each = local.workloadIdentity? [1] : []
for_each = local.workloadIdentity ? [1] : []
content {
workload_pool = "${local.project}.svc.id.goog"
}
Expand Down
Loading