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

If release_channel is active on the module, set min_master_version to… #412

Merged
merged 2 commits into from
Feb 3, 2020
Merged

If release_channel is active on the module, set min_master_version to… #412

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
8557b83
If release_channel is active on the module, set min_master_version to…
Jan 29, 2020
47cc772
Fixing PR comments
Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ resource "google_container_cluster" "primary" {
}
{% endif %}

subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

{% if beta_cluster %}
min_master_version = var.release_channel != null ? null : local.master_version
bharathkkb marked this conversation as resolved.
Show resolved Hide resolved
{% else %}
min_master_version = local.master_version
{% endif %}

logging_service = var.logging_service
monitoring_service = var.monitoring_service
Expand Down Expand Up @@ -354,7 +359,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
5 changes: 3 additions & 2 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
}


subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = local.master_version

logging_service = var.logging_service
Expand Down Expand Up @@ -133,7 +134,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
1 change: 1 addition & 0 deletions examples/simple_regional_beta/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ module "gke" {
database_encryption = var.database_encryption
enable_binary_authorization = var.enable_binary_authorization
pod_security_policy_config = var.pod_security_policy_config
release_channel = "REGULAR"
}

data "google_client_config" "default" {
Expand Down
3 changes: 2 additions & 1 deletion helpers/migrate7.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
]


class ModuleMigration:
"""
Migrate the resources from a flat project factory to match the new
Expand Down Expand Up @@ -396,4 +397,4 @@ def argparser():


if __name__ == "__main__":
main(sys.argv)
main(sys.argv)
7 changes: 4 additions & 3 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
}
}

subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
min_master_version = local.master_version
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = var.release_channel != null ? null : local.master_version

logging_service = var.logging_service
monitoring_service = var.monitoring_service
Expand Down Expand Up @@ -320,7 +321,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
7 changes: 4 additions & 3 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
}
}

subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
min_master_version = local.master_version
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = var.release_channel != null ? null : local.master_version

logging_service = var.logging_service
monitoring_service = var.monitoring_service
Expand Down Expand Up @@ -248,7 +249,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
7 changes: 4 additions & 3 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
}
}

subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
min_master_version = local.master_version
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = var.release_channel != null ? null : local.master_version

logging_service = var.logging_service
monitoring_service = var.monitoring_service
Expand Down Expand Up @@ -235,7 +236,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
5 changes: 3 additions & 2 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
}


subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = local.master_version

logging_service = var.logging_service
Expand Down Expand Up @@ -218,7 +219,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
5 changes: 3 additions & 2 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
}


subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link

min_master_version = local.master_version

logging_service = var.logging_service
Expand Down Expand Up @@ -146,7 +147,7 @@ resource "google_container_node_pool" "pools" {
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
each.value,
"version",
local.node_version,
google_container_cluster.primary.min_master_version,
)

initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/beta_cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module "this" {

cluster_name_suffix = "-${random_string.suffix.result}"
project_id = local.project_id
regional = false
regional = true
region = var.region
zones = slice(var.zones, 0, 1)
network = google_compute_network.main.name
Expand Down
4 changes: 2 additions & 2 deletions test/integration/beta_cluster/controls/gcloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
expect(data['status']).to eq 'RUNNING'
end

it "is zonal" do
expect(data['location']).to match(/^(.*)[1-9]-[a-z]$/)
it "is regional" do
expect(data['location']).to match(/^.*[1-9]$/)
end

it "is single zoned" do
Expand Down