From 529ab2b2ba8a81013608fd0d1b9bcb845d3bee58 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Tue, 12 Sep 2023 00:11:15 +0000 Subject: [PATCH] chore: fix lint and update to dev-tools v1.15 --- Makefile | 2 +- build/int.cloudbuild.yaml | 60 +++++++++---------- build/lint.cloudbuild.yaml | 2 +- examples/safer_cluster_iap_bastion/README.md | 2 +- .../simple_regional_private_beta/README.md | 47 +++++++-------- .../README.md | 46 +++++++------- .../README.md | 41 +++++++------ examples/upstream_nameservers/README.md | 41 +++++++------ examples/workload_metadata_config/README.md | 43 +++++++------ modules/acm/README.md | 2 +- modules/fleet-membership/README.md | 2 +- modules/hub-legacy/README.md | 2 +- .../testdata/TestBetaCluster.json | 2 +- .../testdata/TestSimpleRegional.json | 2 +- 14 files changed, 142 insertions(+), 152 deletions(-) diff --git a/Makefile b/Makefile index 45f6c99a45..15ccba58d9 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # Make will use bash instead of sh SHELL := /usr/bin/env bash -DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.15 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd DOCKER_BIN ?= docker diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 410960c7bd..062a2f4f1c 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -21,14 +21,14 @@ steps: - 'TF_VAR_org_id=$_ORG_ID' - 'TF_VAR_folder_id=$_FOLDER_ID' - 'TF_VAR_billing_account=$_BILLING_ACCOUNT' -- id: create all +- id: create waitFor: - prepare name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create'] - id: init disable-client-cert waitFor: - - prepare + - create name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage init --verbose --test-dir test/integration'] - id: apply disable-client-cert @@ -48,7 +48,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage teardown --verbose --test-dir test/integration'] - id: init shared-vpc-local waitFor: - - create all + - teardown disable-client-cert name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSharedVPC --stage init --verbose --test-dir test/integration'] - id: apply shared-vpc-local @@ -68,7 +68,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSharedVPC --stage teardown --verbose --test-dir test/integration'] - id: init safer-cluster-local waitFor: - - create all + - destroy shared-vpc-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSaferCluster --stage init --verbose'] - id: apply safer-cluster-local @@ -88,7 +88,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSaferCluster --stage destroy --verbose'] - id: init simple-regional-local waitFor: - - create all + - destroy safer-cluster-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleRegional --stage init --verbose'] - id: apply simple-regional-local @@ -103,12 +103,12 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleRegional --stage verify --verbose'] - id: destroy simple-regional-local waitFor: - - apply simple-regional-local + - verify simple-regional-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleRegional --stage teardown --verbose'] - id: init simple-regional-private-local waitFor: - - create all + - destroy simple-regional-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalPrivate --stage init --verbose'] - id: apply simple-regional-private-local @@ -128,7 +128,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalPrivate --stage teardown --verbose'] - id: init simple-regional-with-kubeconfig-local waitFor: - - create all + - destroy simple-regional-private-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithKubeConfig --stage init --verbose'] - id: apply simple-regional-with-kubeconfig-local @@ -148,7 +148,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithKubeConfig --stage teardown --verbose'] - id: converge simple-regional-with-gateway-api-local waitFor: - - create all + - destroy simple-regional-with-kubeconfig-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge simple-regional-with-gateway-api-local'] - id: verify simple-regional-with-gateway-api-local @@ -163,7 +163,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy simple-regional-with-gateway-api-local'] - id: init simple-regional-with-networking-local waitFor: - - create all + - destroy simple-regional-with-gateway-api-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithNetworking --stage init --verbose'] - id: apply simple-regional-with-networking-local @@ -183,7 +183,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithNetworking --stage teardown --verbose'] - id: init simple-zonal-local waitFor: - - create all + - destroy simple-regional-with-networking-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage init --verbose'] - id: apply simple-zonal-local @@ -203,7 +203,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage teardown --verbose'] - id: init simple-zonal-private-local waitFor: - - create all + - destroy simple-zonal-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalPrivate --stage init --verbose'] - id: apply simple-zonal-private-local @@ -223,7 +223,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalPrivate --stage teardown --verbose'] - id: converge stub-domains-local waitFor: - - create all + - destroy simple-zonal-private-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge stub-domains-local'] - id: verify stub-domains-local @@ -238,7 +238,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy stub-domains-local'] - id: converge upstream-nameservers-local waitFor: - - create all + - destroy stub-domains-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge upstream-nameservers-local'] - id: verify upstream-nameservers-local @@ -253,7 +253,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy upstream-nameservers-local'] - id: converge stub-domains-upstream-nameservers-local waitFor: - - create all + - destroy upstream-nameservers-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge stub-domains-upstream-nameservers-local'] - id: verify stub-domains-upstream-nameservers-local @@ -268,7 +268,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy stub-domains-upstream-nameservers-local'] - id: converge workload-metadata-config-local waitFor: - - create all + - destroy stub-domains-upstream-nameservers-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge workload-metadata-config-local'] - id: verify workload-metadata-config-local @@ -283,7 +283,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy workload-metadata-config-local'] - id: init beta-cluster waitFor: - - prepare + - destroy workload-metadata-config-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage init --verbose --test-dir test/integration'] - id: apply beta-cluster @@ -303,7 +303,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage teardown --verbose --test-dir test/integration'] - id: init simple-windows-node-pool-local waitFor: - - create all + - teardown beta-cluster name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleWindowsNodePool --stage init --verbose --test-dir test/integration'] - id: apply simple-windows-node-pool-local @@ -323,7 +323,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleWindowsNodePool --stage teardown --verbose --test-dir test/integration'] - id: init deploy-service-local waitFor: - - create all + - destroy simple-windows-node-pool-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestDeployService --stage init --verbose'] - id: apply deploy-service-local @@ -343,7 +343,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestDeployService --stage destroy --verbose'] - id: converge node-pool-local waitFor: - - create all + - destroy deploy-service-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge node-pool-local'] - id: verify node-pool-local @@ -358,7 +358,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy node-pool-local'] - id: init sandbox-enabled-local waitFor: - - create all + - destroy node-pool-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSandboxEnabled --stage init --verbose'] - id: apply sandbox-enabled-local @@ -378,7 +378,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSandboxEnabled --stage destroy --verbose'] - id: converge workload-identity-local waitFor: - - create all + - destroy sandbox-enabled-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge workload-identity-local'] - id: verify workload-identity-local @@ -393,7 +393,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy workload-identity-local'] - id: converge safer-cluster-iap-bastion-local waitFor: - - create all + - destroy workload-identity-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge safer-cluster-iap-bastion-local'] - id: verify safer-cluster-iap-bastion-local @@ -408,7 +408,7 @@ steps: args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy safer-cluster-iap-bastion-local'] - id: init simple-zonal-with-asm-local waitFor: - - create all + - destroy safer-cluster-iap-bastion-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage init --verbose'] - id: apply simple-zonal-with-asm-local @@ -428,7 +428,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage teardown --verbose'] - id: init simple-autopilot-private-local waitFor: - - create all + - destroy simple-zonal-with-asm-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivate --stage init --verbose'] - id: apply simple-autopilot-private-local @@ -443,12 +443,12 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivate --stage verify --verbose'] - id: destroy simple-autopilot-private-local waitFor: - - apply simple-autopilot-private-local + - verify simple-autopilot-private-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivate --stage teardown --verbose'] - id: init simple-autopilot-public-local waitFor: - - create all + - destroy simple-autopilot-private-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPublic --stage init --verbose'] - id: apply simple-autopilot-public-local @@ -468,7 +468,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPublic --stage teardown --verbose'] - id: init private-zonal-with-networking waitFor: - - prepare + - destroy simple-autopilot-public-local name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage init --verbose --test-dir test/integration'] - id: apply private-zonal-with-networking @@ -488,7 +488,7 @@ steps: args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage teardown --verbose --test-dir test/integration'] - id: init simple-autopilot-private-non-default-sa waitFor: - - prepare + - teardown private-zonal-with-networking name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivateNonDefaultSA --stage init --verbose'] - id: apply simple-autopilot-private-non-default-sa @@ -511,6 +511,6 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.15' options: machineType: 'N1_HIGHCPU_8' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index b163e13577..b3ac64bc6d 100644 --- a/build/lint.cloudbuild.yaml +++ b/build/lint.cloudbuild.yaml @@ -22,7 +22,7 @@ tags: - 'lint' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.15' options: machineType: 'N1_HIGHCPU_8' env: diff --git a/examples/safer_cluster_iap_bastion/README.md b/examples/safer_cluster_iap_bastion/README.md index f527858d5e..700bc6e659 100644 --- a/examples/safer_cluster_iap_bastion/README.md +++ b/examples/safer_cluster_iap_bastion/README.md @@ -71,4 +71,4 @@ To deploy this example: | router\_name | Name of the router that was created | | subnet\_name | The name of the VPC subnet being created | - + diff --git a/examples/simple_regional_private_beta/README.md b/examples/simple_regional_private_beta/README.md index 160fc74a4c..86e54b7746 100644 --- a/examples/simple_regional_private_beta/README.md +++ b/examples/simple_regional_private_beta/README.md @@ -2,45 +2,42 @@ This example illustrates how to create a simple private cluster with beta features. -[^]: (autogen_docs_start) - + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| cloudrun | Boolean to enable / disable CloudRun | string | `"true"` | no | -| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | -| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | -| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | -| istio | Boolean to enable / disable Istio | string | `"true"` | no | -| network | The VPC network to host the cluster in | string | n/a | yes | -| project\_id | The project ID to host the cluster in | string | n/a | yes | -| region | The region to host the cluster in | string | n/a | yes | -| subnetwork | The subnetwork to host the cluster in | string | n/a | yes | +|------|-------------|------|---------|:--------:| +| cluster\_name\_suffix | A suffix to append to the default cluster name | `string` | `""` | no | +| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | `any` | n/a | yes | +| dns\_cache | Boolean to enable / disable NodeLocal DNSCache | `bool` | `false` | no | +| gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `false` | no | +| ip\_range\_pods | The secondary ip range to use for pods | `any` | n/a | yes | +| ip\_range\_services | The secondary ip range to use for services | `any` | n/a | yes | +| network | The VPC network to host the cluster in | `any` | n/a | yes | +| project\_id | The project ID to host the cluster in | `any` | n/a | yes | +| region | The region to host the cluster in | `any` | n/a | yes | +| subnetwork | The subnetwork to host the cluster in | `any` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| ca\_certificate | | -| client\_token | | +| ca\_certificate | n/a | +| client\_token | n/a | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | -| kubernetes\_endpoint | | -| location | | +| kubernetes\_endpoint | n/a | +| location | n/a | | master\_kubernetes\_version | The master Kubernetes version | -| network | | -| project\_id | | -| region | | -| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | -| subnetwork | | +| network | n/a | +| project\_id | n/a | +| region | n/a | +| service\_account | The default service account used for running nodes. | +| subnetwork | n/a | | zones | List of zones in which the cluster resides | -[^]: (autogen_docs_end) + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/examples/simple_regional_private_with_cluster_version/README.md b/examples/simple_regional_private_with_cluster_version/README.md index 160fc74a4c..26a676675d 100644 --- a/examples/simple_regional_private_with_cluster_version/README.md +++ b/examples/simple_regional_private_with_cluster_version/README.md @@ -2,45 +2,41 @@ This example illustrates how to create a simple private cluster with beta features. -[^]: (autogen_docs_start) - + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| cloudrun | Boolean to enable / disable CloudRun | string | `"true"` | no | -| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| credentials\_path | The path to the GCP credentials JSON file | string | n/a | yes | -| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | -| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | -| istio | Boolean to enable / disable Istio | string | `"true"` | no | -| network | The VPC network to host the cluster in | string | n/a | yes | -| project\_id | The project ID to host the cluster in | string | n/a | yes | -| region | The region to host the cluster in | string | n/a | yes | -| subnetwork | The subnetwork to host the cluster in | string | n/a | yes | +|------|-------------|------|---------|:--------:| +| cluster\_name\_suffix | A suffix to append to the default cluster name | `string` | `""` | no | +| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | `any` | n/a | yes | +| ip\_range\_pods | The secondary ip range to use for pods | `any` | n/a | yes | +| ip\_range\_services | The secondary ip range to use for services | `any` | n/a | yes | +| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | `string` | `"latest"` | no | +| network | The VPC network to host the cluster in | `any` | n/a | yes | +| project\_id | The project ID to host the cluster in | `any` | n/a | yes | +| region | The region to host the cluster in | `any` | n/a | yes | +| subnetwork | The subnetwork to host the cluster in | `any` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| ca\_certificate | | -| client\_token | | +| ca\_certificate | n/a | +| client\_token | n/a | | cluster\_name | Cluster name | -| credentials\_path | | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | -| kubernetes\_endpoint | | -| location | | +| kubernetes\_endpoint | n/a | +| location | n/a | | master\_kubernetes\_version | The master Kubernetes version | -| network | | -| project\_id | | -| region | | -| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | -| subnetwork | | +| network | n/a | +| project\_id | n/a | +| region | n/a | +| service\_account | The default service account used for running nodes. | +| subnetwork | n/a | | zones | List of zones in which the cluster resides | -[^]: (autogen_docs_end) + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/examples/stub_domains_upstream_nameservers/README.md b/examples/stub_domains_upstream_nameservers/README.md index 5448cc812b..0c47b3a7e1 100644 --- a/examples/stub_domains_upstream_nameservers/README.md +++ b/examples/stub_domains_upstream_nameservers/README.md @@ -7,41 +7,40 @@ It will: - Remove the default kube-dns configmap - Add a new kube-dns configmap with custom stub domains and upstream nameservers -[^]: (autogen_docs_start) - + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | -| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | -| network | The VPC network to host the cluster in | string | n/a | yes | -| project\_id | The project ID to host the cluster in | string | n/a | yes | -| region | The region to host the cluster in | string | n/a | yes | -| subnetwork | The subnetwork to host the cluster in | string | n/a | yes | +|------|-------------|------|---------|:--------:| +| cluster\_name\_suffix | A suffix to append to the default cluster name | `string` | `""` | no | +| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | `any` | n/a | yes | +| ip\_range\_pods | The secondary ip range to use for pods | `any` | n/a | yes | +| ip\_range\_services | The secondary ip range to use for services | `any` | n/a | yes | +| network | The VPC network to host the cluster in | `any` | n/a | yes | +| project\_id | The project ID to host the cluster in | `any` | n/a | yes | +| region | The region to host the cluster in | `any` | n/a | yes | +| subnetwork | The subnetwork to host the cluster in | `any` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| ca\_certificate | | -| client\_token | | +| ca\_certificate | n/a | +| client\_token | n/a | | cluster\_name | Cluster name | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | -| kubernetes\_endpoint | | -| location | | +| kubernetes\_endpoint | n/a | +| location | n/a | | master\_kubernetes\_version | The master Kubernetes version | -| network | | -| project\_id | | -| region | | -| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | -| subnetwork | | +| network | n/a | +| project\_id | n/a | +| region | n/a | +| service\_account | The default service account used for running nodes. | +| subnetwork | n/a | | zones | List of zones in which the cluster resides | -[^]: (autogen_docs_end) + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/examples/upstream_nameservers/README.md b/examples/upstream_nameservers/README.md index f980e64f12..63515d7309 100644 --- a/examples/upstream_nameservers/README.md +++ b/examples/upstream_nameservers/README.md @@ -7,41 +7,40 @@ It will: - Remove the default kube-dns configmap - Add a new kube-dns configmap with custom upstream nameservers -[^]: (autogen_docs_start) - + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | -| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | -| network | The VPC network to host the cluster in | string | n/a | yes | -| project\_id | The project ID to host the cluster in | string | n/a | yes | -| region | The region to host the cluster in | string | n/a | yes | -| subnetwork | The subnetwork to host the cluster in | string | n/a | yes | +|------|-------------|------|---------|:--------:| +| cluster\_name\_suffix | A suffix to append to the default cluster name | `string` | `""` | no | +| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | `any` | n/a | yes | +| ip\_range\_pods | The secondary ip range to use for pods | `any` | n/a | yes | +| ip\_range\_services | The secondary ip range to use for services | `any` | n/a | yes | +| network | The VPC network to host the cluster in | `any` | n/a | yes | +| project\_id | The project ID to host the cluster in | `any` | n/a | yes | +| region | The region to host the cluster in | `any` | n/a | yes | +| subnetwork | The subnetwork to host the cluster in | `any` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| ca\_certificate | | -| client\_token | | +| ca\_certificate | n/a | +| client\_token | n/a | | cluster\_name | Cluster name | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | -| kubernetes\_endpoint | | -| location | | +| kubernetes\_endpoint | n/a | +| location | n/a | | master\_kubernetes\_version | The master Kubernetes version | -| network | | -| project\_id | | -| region | | -| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | -| subnetwork | | +| network | n/a | +| project\_id | n/a | +| region | n/a | +| service\_account | The default service account used for running nodes. | +| subnetwork | n/a | | zones | List of zones in which the cluster resides | -[^]: (autogen_docs_end) + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/examples/workload_metadata_config/README.md b/examples/workload_metadata_config/README.md index 19b990d963..e258123b3c 100644 --- a/examples/workload_metadata_config/README.md +++ b/examples/workload_metadata_config/README.md @@ -2,42 +2,41 @@ This example illustrates how to use a cluster with `workload_metadata_config` defined. -[^]: (autogen_docs_start) - + ## Inputs | Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| cluster\_name\_suffix | A suffix to append to the default cluster name | string | `""` | no | -| compute\_engine\_service\_account | Service account to associate to the nodes in the cluster | string | n/a | yes | -| ip\_range\_pods | The secondary ip range to use for pods | string | n/a | yes | -| ip\_range\_services | The secondary ip range to use for pods | string | n/a | yes | -| network | The VPC network to host the cluster in | string | n/a | yes | -| project\_id | The project ID to host the cluster in | string | n/a | yes | -| region | The region to host the cluster in | string | n/a | yes | -| subnetwork | The subnetwork to host the cluster in | string | n/a | yes | -| zones | The zone to host the cluster in (required if is a zonal cluster) | list | n/a | yes | +|------|-------------|------|---------|:--------:| +| cluster\_name\_suffix | A suffix to append to the default cluster name | `string` | `""` | no | +| ip\_range\_pods | The secondary ip range to use for pods | `any` | n/a | yes | +| ip\_range\_services | The secondary ip range to use for services | `any` | n/a | yes | +| network | The VPC network to host the cluster in | `any` | n/a | yes | +| project\_id | The project ID to host the cluster in | `any` | n/a | yes | +| region | The region to host the cluster in | `any` | n/a | yes | +| registry\_project\_ids | Project names for GCR registries | `list(string)` | n/a | yes | +| subnetwork | The subnetwork to host the cluster in | `any` | n/a | yes | +| zones | The zone to host the cluster in (required if is a zonal cluster) | `list(string)` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| ca\_certificate | | -| client\_token | | +| ca\_certificate | n/a | +| client\_token | n/a | | cluster\_name | Cluster name | | ip\_range\_pods | The secondary IP range used for pods | | ip\_range\_services | The secondary IP range used for services | -| kubernetes\_endpoint | | -| location | | +| kubernetes\_endpoint | n/a | +| location | n/a | | master\_kubernetes\_version | The master Kubernetes version | -| network | | -| project\_id | | -| region | | -| service\_account | The service account to default running nodes as if not overridden in `node_pools`. | -| subnetwork | | +| network | n/a | +| project\_id | n/a | +| region | n/a | +| service\_account | The default service account used for running nodes. | +| subnetwork | n/a | | zones | List of zones in which the cluster resides | -[^]: (autogen_docs_end) + To provision this example, run the following from within this directory: - `terraform init` to get the plugins diff --git a/modules/acm/README.md b/modules/acm/README.md index 8fb4ca68fe..fe284182b5 100644 --- a/modules/acm/README.md +++ b/modules/acm/README.md @@ -110,4 +110,4 @@ data "google_client_config" "default" {} | git\_creds\_public | Public key of SSH keypair to allow the Anthos Config Management Operator to authenticate to your Git repository. | | wait | An output to use when you want to depend on cmd finishing | - + diff --git a/modules/fleet-membership/README.md b/modules/fleet-membership/README.md index 24a506c23b..9b1fdf6f5e 100644 --- a/modules/fleet-membership/README.md +++ b/modules/fleet-membership/README.md @@ -39,4 +39,4 @@ To deploy this config: | cluster\_membership\_id | The ID of the hub membership | | wait | An output to use when you want to depend on registration finishing | - + diff --git a/modules/hub-legacy/README.md b/modules/hub-legacy/README.md index 999f8113d4..0a5d5debdb 100644 --- a/modules/hub-legacy/README.md +++ b/modules/hub-legacy/README.md @@ -56,4 +56,4 @@ To deploy this config: |------|-------------| | wait | An output to use when you want to depend on registration finishing | - + diff --git a/test/integration/beta_cluster/testdata/TestBetaCluster.json b/test/integration/beta_cluster/testdata/TestBetaCluster.json index f1beb5f564..5daccb0acb 100755 --- a/test/integration/beta_cluster/testdata/TestBetaCluster.json +++ b/test/integration/beta_cluster/testdata/TestBetaCluster.json @@ -321,4 +321,4 @@ "subnetwork": "cft-gke-test-qwc4", "verticalPodAutoscaling": {}, "zone": "us-central1" -} \ No newline at end of file +} diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json index 31d14b4180..dec9d87fd5 100644 --- a/test/integration/simple_regional/testdata/TestSimpleRegional.json +++ b/test/integration/simple_regional/testdata/TestSimpleRegional.json @@ -328,4 +328,4 @@ "workloadPool": "PROJECT_ID.svc.id.goog" }, "zone": "us-central1" -} \ No newline at end of file +}