-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
571 additions
and
116 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # Upgrading to v25.0 | ||
| The v25.0 release of *kubernetes-engine* is a backwards incompatible | ||
| release. | ||
|
|
||
| ### gce_pd_csi_driver is GA and enabled by default | ||
|
|
||
| `gce_pd_csi_driver` is now supported in GA modules and defaults to true. To opt out, set `gce_pd_csi_driver` to `false`. | ||
|
|
||
| ```diff | ||
| module "gke" { | ||
| - source = "terraform-google-modules/kubernetes-engine" | ||
| - version = "~> 24.0" | ||
| + source = "terraform-google-modules/kubernetes-engine" | ||
| + version = "~> 25.0" | ||
| ... | ||
| + gce_pd_csi_driver = false | ||
| } | ||
| ``` | ||
|
|
||
| ### Use the created service account when creating autopilot clusters | ||
|
|
||
| When `create_service_account` is `true` pass the created service account to the `cluster_autoscaling` -> `auto_provisioning_defaults` block | ||
| for the `beta-autopilot-private-cluster` / `beta-autopilot-public-cluster` modules. | ||
|
|
||
| This will mean that the `Nodes` will use the created service account, where previously the default service account was erronously used instead. | ||
|
|
||
| To opt out, set `create_service_account` to `false` | ||
|
|
||
| ```diff | ||
| module "gke" { | ||
| - source = "terraform-google-modules/kubernetes-engine" | ||
| - version = "~> 24.0" | ||
| + source = "terraform-google-modules/kubernetes-engine" | ||
| + version = "~> 25.0" | ||
| ... | ||
| + create_service_account = false | ||
| } | ||
| ``` | ||
|
|
||
| ### Minimum Google Provider versions | ||
|
|
||
| Minimum Google Provider versions have been updated to `4.44.0`. |
33 changes: 33 additions & 0 deletions
33
examples/simple_autopilot_private_non_default_sa/README.md
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,33 @@ | ||
| # Simple Regional Autopilot Cluster | ||
|
|
||
| This example illustrates how to create a simple autopilot cluster with beta features and | ||
| not using the default service account. | ||
|
|
||
| <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | project\_id | The project ID to host the cluster in | `any` | n/a | yes | | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Name | Description | | ||
| |------|-------------| | ||
| | cluster\_name | Cluster name | | ||
| | kubernetes\_endpoint | The cluster endpoint | | ||
| | location | n/a | | ||
| | master\_kubernetes\_version | Kubernetes version of the master | | ||
| | network\_name | The name of the VPC being created | | ||
| | region | The region in which the cluster resides | | ||
| | service\_account | The service account to default running nodes as if not overridden in `node_pools`. | | ||
| | subnet\_names | The names of the subnet being created | | ||
| | zones | List of zones in which the cluster resides | | ||
|
|
||
| <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
|
|
||
| To provision this example, run the following from within this directory: | ||
| - `terraform init` to get the plugins | ||
| - `terraform plan` to see the infrastructure plan | ||
| - `terraform apply` to apply the infrastructure build | ||
| - `terraform destroy` to destroy the built infrastructure |
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,59 @@ | ||
| /** | ||
| * 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. | ||
| */ | ||
|
|
||
| locals { | ||
| cluster_type = "simple-ap-private-non-default-sa" | ||
| network_name = "${local.cluster_type}-network" | ||
| subnet_name = "${local.cluster_type}-subnet" | ||
| master_auth_subnetwork = "${local.cluster_type}-master-subnet" | ||
| pods_range_name = "ip-range-pods-${local.cluster_type}" | ||
| svc_range_name = "ip-range-svc-${local.cluster_type}" | ||
| subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split("/", subnet_self_link)[length(split("/", subnet_self_link)) - 1]] | ||
| } | ||
|
|
||
|
|
||
| data "google_client_config" "default" {} | ||
|
|
||
| provider "kubernetes" { | ||
| host = "https://${module.gke.endpoint}" | ||
| token = data.google_client_config.default.access_token | ||
| cluster_ca_certificate = base64decode(module.gke.ca_certificate) | ||
| } | ||
|
|
||
| module "gke" { | ||
| source = "../../modules/beta-autopilot-private-cluster/" | ||
| project_id = var.project_id | ||
| name = "${local.cluster_type}-cluster" | ||
| regional = true | ||
| region = "us-central1" | ||
| network = module.gcp-network.network_name | ||
| subnetwork = local.subnet_names[index(module.gcp-network.subnets_names, local.subnet_name)] | ||
| ip_range_pods = local.pods_range_name | ||
| ip_range_services = local.svc_range_name | ||
| release_channel = "REGULAR" | ||
| enable_vertical_pod_autoscaling = true | ||
| enable_private_endpoint = true | ||
| enable_private_nodes = true | ||
| master_ipv4_cidr_block = "172.16.0.0/28" | ||
| datapath_provider = "ADVANCED_DATAPATH" | ||
|
|
||
| master_authorized_networks = [ | ||
| { | ||
| cidr_block = "10.60.0.0/17" | ||
| display_name = "VPC" | ||
| }, | ||
| ] | ||
| } |
50 changes: 50 additions & 0 deletions
50
examples/simple_autopilot_private_non_default_sa/network.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,50 @@ | ||
| /** | ||
| * 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. | ||
| */ | ||
|
|
||
| module "gcp-network" { | ||
| source = "terraform-google-modules/network/google" | ||
| version = ">= 4.0.1" | ||
|
|
||
| project_id = var.project_id | ||
| network_name = local.network_name | ||
|
|
||
| subnets = [ | ||
| { | ||
| subnet_name = local.subnet_name | ||
| subnet_ip = "10.0.0.0/17" | ||
| subnet_region = "us-central1" | ||
| subnet_private_access = true | ||
| }, | ||
| { | ||
| subnet_name = local.master_auth_subnetwork | ||
| subnet_ip = "10.60.0.0/17" | ||
| subnet_region = "us-central1" | ||
| }, | ||
| ] | ||
|
|
||
| secondary_ranges = { | ||
| (local.subnet_name) = [ | ||
| { | ||
| range_name = local.pods_range_name | ||
| ip_cidr_range = "192.168.0.0/18" | ||
| }, | ||
| { | ||
| range_name = local.svc_range_name | ||
| ip_cidr_range = "192.168.64.0/18" | ||
| }, | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.