-
Notifications
You must be signed in to change notification settings - Fork 770
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor GKE nodepool and blueprints (#875)
* first shot, untested * example tests working * module tests * work on gke blueprints * multitenant fleet doc examples * fix gke hub doc examples * blueprint tests * move master range to vpc config * fast stage 3 gke test * tfdoc * bump provider versions * and bump provider again to latest
- Loading branch information
Showing
116 changed files
with
1,221 additions
and
1,371 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
blueprints/gke/multi-cluster-mesh-gke-fleet-api/ansible.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** | ||
| * Copyright 2022 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| # tfdoc:file:description Ansible generated files. | ||
|
|
||
| resource "local_file" "vars_file" { | ||
| content = templatefile("${path.module}/templates/vars.yaml.tpl", { | ||
| istio_version = var.istio_version | ||
| region = var.region | ||
| clusters = keys(var.clusters_config) | ||
| service_account_email = module.mgmt_server.service_account_email | ||
| project_id = module.fleet_project.project_id | ||
| }) | ||
| filename = "${path.module}/ansible/vars/vars.yaml" | ||
| file_permission = "0666" | ||
| } | ||
|
|
||
| resource "local_file" "gssh_file" { | ||
| content = templatefile("${path.module}/templates/gssh.sh.tpl", { | ||
| project_id = var.mgmt_project_id | ||
| zone = var.mgmt_server_config.zone | ||
| }) | ||
| filename = "${path.module}/ansible/gssh.sh" | ||
| file_permission = "0777" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /** | ||
| * Copyright 2022 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| # tfdoc:file:description GKE cluster and hub resources. | ||
|
|
||
| module "clusters" { | ||
| for_each = var.clusters_config | ||
| source = "../../../modules/gke-cluster" | ||
| project_id = module.fleet_project.project_id | ||
| name = each.key | ||
| location = var.region | ||
| vpc_config = { | ||
| network = module.svpc.self_link | ||
| subnetwork = module.svpc.subnet_self_links["${var.region}/subnet-${each.key}"] | ||
| master_authorized_ranges = merge({ | ||
| mgmt : var.mgmt_subnet_cidr_block | ||
| }, | ||
| { for key, config in var.clusters_config : | ||
| "pods-${key}" => config.pods_cidr_block if key != each.key | ||
| }) | ||
| master_ipv4_cidr_block = each.value.master_cidr_block | ||
| } | ||
| private_cluster_config = { | ||
| enable_private_endpoint = true | ||
| master_global_access = true | ||
| } | ||
| release_channel = "REGULAR" | ||
| labels = { | ||
| mesh_id = "proj-${module.fleet_project.number}" | ||
| } | ||
| } | ||
|
|
||
| module "cluster_nodepools" { | ||
| for_each = var.clusters_config | ||
| source = "../../../modules/gke-nodepool" | ||
| project_id = module.fleet_project.project_id | ||
| cluster_name = module.clusters[each.key].name | ||
| location = var.region | ||
| name = "nodepool-${each.key}" | ||
| node_count = { initial = 1 } | ||
| service_account = {} | ||
| tags = ["${each.key}-node"] | ||
| } | ||
|
|
||
| module "hub" { | ||
| source = "../../../modules/gke-hub" | ||
| project_id = module.fleet_project.project_id | ||
| clusters = { for k, v in module.clusters : k => v.id } | ||
| features = { | ||
| appdevexperience = false | ||
| configmanagement = false | ||
| identityservice = false | ||
| multiclusteringress = null | ||
| servicemesh = true | ||
| multiclusterservicediscovery = false | ||
| } | ||
| depends_on = [ | ||
| module.fleet_project | ||
| ] | ||
| } |
Oops, something went wrong.