Colors, symlink and rand suffix

* Replace outputs w/ symlink * disable color in tests * adding suffix
terraform-google-modules · Jan 7, 2019 · f4f0b46 · f4f0b46
1 parent b1e9db0
commit f4f0b46
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 120 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -43,11 +43,12 @@ suites:
       root_module_directory: test/fixtures/disable_client_cert
     verifier:
       name: terraform
+      color: false
       systems:
         - name: disable_client_cert
           backend: local
     provisioner:
-      name: terraform      
+      name: terraform
   - name: "node_pool"
     driver:
       name: "terraform"

diff --git a/README.md b/README.md
@@ -84,15 +84,13 @@ Then perform the following commands on the root folder:
 
 [^]: (autogen_docs_start)
 
+
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| basic\_auth\_password | Kubernetes HTTP Basic auth password. Defaults to empty string. Only used if `enable_basic_auth` is true | string | `` | no |
-| basic\_auth\_username | Kubernetes HTTP Basic auth username. Defaults to empty string. Only used if `enable_basic_auth` is true | string | `` | no |
 | description | The description of the cluster | string | `` | no |
-<<<<<<< HEAD
-| horizontal_pod_autoscaling | Enable horizontal pod autoscaling addon | string | `false` | no |
+| horizontal_pod_autoscaling | Enable horizontal pod autoscaling addon | string | `true` | no |
 | http_load_balancing | Enable httpload balancer addon | string | `true` | no |
 | ip_masq_link_local | Whether to masquerade traffic to the link-local prefix (169.254.0.0/16). | string | `false` | no |
 | ip_masq_resync_interval | The interval at which the agent attempts to sync its ConfigMap file from the disk. | string | `60s` | no |
@@ -104,63 +102,44 @@ Then perform the following commands on the root folder:
 | maintenance_start_time | Time window specified for daily maintenance operations in RFC3339 format | string | `05:00` | no |
 | master_authorized_networks_config | The desired configuration options for master authorized networks. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)<br><br>  ### example format ###   master_authorized_networks_config = [{     cidr_blocks = [{       cidr_block   = "10.0.0.0/8"       display_name = "example_network"     }],   }] | list | `<list>` | no |
 | monitoring_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | string | `monitoring.googleapis.com` | no |
-=======
-| enable\_basic\_auth | Basic authentication allows a user to authenticate to the cluster with a username and password. To maximize the security of your cluster, disable this option. Basic authentication is not recommended because it provides no confidentiality protection for transmitted credentials. Default: true | string | `true` | no |
-| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | string | `false` | no |
-| http\_load\_balancing | Enable httpload balancer addon | string | `true` | no |
-| ip\_masq\_link\_local | Whether to masquerade traffic to the link-local prefix (169.254.0.0/16). | string | `false` | no |
-| ip\_masq\_resync\_interval | The interval at which the agent attempts to sync its ConfigMap file from the disk. | string | `60s` | no |
-| ip\_range\_pods | The secondary ip range to use for pods | string | - | yes |
-| ip\_range\_services | The secondary ip range to use for pods | string | - | yes |
-| issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! Default: false | string | `false` | no |
-| kubernetes\_dashboard | Enable kubernetes dashboard addon | string | `false` | no |
-| 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 |
-| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `logging.googleapis.com` | no |
-| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `05:00` | no |
-| master\_authorized\_networks\_config | The desired configuration options for master authorized networks. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)<br><br>  ### example format ###   master_authorized_networks_config = [{     cidr_blocks = [{       cidr_block   = "10.0.0.0/8"       display_name = "example_network"     }],   }] | list | `<list>` | no |
-| monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | string | `monitoring.googleapis.com` | no |
->>>>>>> Adding variables to README
 | name | The name of the cluster (required) | string | - | yes |
 | network | The VPC network to host the cluster in (required) | string | - | yes |
-| network\_policy | Enable network policy addon | string | `false` | no |
-| network\_project\_id | The project ID of the shared VPC's host (for shared vpc support) | string | `` | no |
-| node\_pools | List of maps containing node pools | list | `<list>` | no |
-| node\_pools\_labels | Map of maps containing node labels by node-pool name | map | `<map>` | no |
-| node\_pools\_tags | Map of lists containing node network tags by node-pool name | map | `<map>` | no |
-| node\_pools\_taints | Map of lists containing node taints by node-pool name | map | `<map>` | no |
-| node\_version | The Kubernetes version of the node pools. Defaults kubernetes_version (master) variable and can be overridden for individual node pools by setting the `version` key on them. Must be empyty or set the same as master at cluster creation. | string | `` | no |
-| non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | list | `<list>` | no |
-| project\_id | The project ID to host the cluster in (required) | string | - | yes |
+| network_policy | Enable network policy addon | string | `false` | no |
+| network_project_id | The project ID of the shared VPC's host (for shared vpc support) | string | `` | no |
+| remove_default_node_pool | Boolean value determining removal of default node pool | bool | false | no |
+| node_pools | List of maps containing node pools | list | `<list>` | no |
+| node_pools_labels | Map of maps containing node labels by node-pool name | map | `<map>` | no |
+| node_pools_tags | Map of lists containing node network tags by node-pool name | map | `<map>` | no |
+| node_pools_taints | Map of lists containing node taints by node-pool name | map | `<map>` | no |
+| node_version | The Kubernetes version of the node pools. Defaults kubernetes_version (master) variable and can be overridden for individual node pools by setting the `version` key on them. Must be empyty or set the same as master at cluster creation. | string | `` | no |
+| non_masquerade_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | list | `<list>` | no |
+| project_id | The project ID to host the cluster in (required) | string | - | yes |
 | region | The region to host the cluster in (required) | string | - | yes |
 | regional | Whether is a regional cluster (zonal cluster if set false. WARNING: changing this after cluster creation is destructive!) | string | `true` | no |
-<<<<<<< HEAD
 | service_account | The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account | string | `` | no |
 | stub_domains | Map of stub domains and their resolvers to forward DNS queries for a certain domain to an external DNS server | map | `<map>` | no |
-=======
-| stub\_domains | Map of stub domains and their resolvers to forward DNS queries for a certain domain to an external DNS server | map | `<map>` | no |
->>>>>>> Adding variables to README
 | subnetwork | The subnetwork to host the cluster in (required) | string | - | yes |
 | zones | The zones to host the cluster in (optional if regional cluster / required if zonal) | list | `<list>` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| ca\_certificate | Cluster ca certificate (base64 encoded) |
+| ca_certificate | Cluster ca certificate (base64 encoded) |
 | endpoint | Cluster endpoint |
-| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
-| http\_load\_balancing\_enabled | Whether http load balancing enabled |
-| kubernetes\_dashboard\_enabled | Whether kubernetes dashboard enabled |
+| horizontal_pod_autoscaling_enabled | Whether horizontal pod autoscaling enabled |
+| http_load_balancing_enabled | Whether http load balancing enabled |
+| kubernetes_dashboard_enabled | Whether kubernetes dashboard enabled |
 | location | Cluster location (region if regional cluster, zone if zonal cluster) |
-| logging\_service | Logging service used |
-| master\_authorized\_networks\_config | Networks from which access to master is permitted |
-| master\_version | Current master kubernetes version |
-| min\_master\_version | Minimum master kubernetes version |
-| monitoring\_service | Monitoring service used |
+| logging_service | Logging service used |
+| master_authorized_networks_config | Networks from which access to master is permitted |
+| master_version | Current master kubernetes version |
+| min_master_version | Minimum master kubernetes version |
+| monitoring_service | Monitoring service used |
 | name | Cluster name |
-| network\_policy\_enabled | Whether network policy enabled |
-| node\_pools\_names | List of node pools names |
-| node\_pools\_versions | List of node pools versions |
+| network_policy_enabled | Whether network policy enabled |
+| node_pools_names | List of node pools names |
+| node_pools_versions | List of node pools versions |
 | region | Cluster region |
 | type | Cluster type (regional / zonal) |
 | zones | List of zones in which the cluster resides |
@@ -234,10 +213,9 @@ make generate_docs
 
 Integration tests are run though [test-kitchen](https://github.com/test-kitchen/test-kitchen), [kitchen-terraform](https://github.com/newcontext-oss/kitchen-terraform), and [InSpec](https://github.com/inspec/inspec).
 
-Seven test-kitchen instances are defined:
+Six test-kitchen instances are defined:
 
 - `deploy_service`
-- `disable_client_cert`
 - `node_pool`
 - `shared_vpc`
 - `simple_regional`
@@ -253,8 +231,8 @@ The test-kitchen instances in `test/fixtures/` wrap identically-named examples i
 3. Build the Docker containers for testing:
 
   ```
-  CREDENTIALS_FILE="credentials.json" make docker_build_terraform
-  CREDENTIALS_FILE="credentials.json" make docker_build_kitchen_terraform
+  make docker_build_terraform
+  make docker_build_kitchen_terraform
   ```
 4. Run the testing container in interactive mode:
 
@@ -270,7 +248,7 @@ The test-kitchen instances in `test/fixtures/` wrap identically-named examples i
   3. `kitchen verify` tests the created infrastructure. Run `kitchen verify <INSTANCE_NAME>` to run a specific test case.
   4. `kitchen destroy` tears down the underlying resources created by `kitchen converge`. Run `kitchen destroy <INSTANCE_NAME>` to tear down resources for a specific test case.
 
-Alternatively, you can simply run `CREDENTIALS_FILE="credentials.json"  make test_integration_docker` to run all the test steps non-interactively.
+Alternatively, you can simply run `make test_integration_docker` to run all the test steps non-interactively.
 
 #### Test configuration
 
@@ -325,4 +303,4 @@ are as follows:
 is a compiled language so there is no standard linter.
 * Terraform - terraform has a built-in linter in the 'terraform validate'
 command.
-* Dockerfiles - hadolint. Can be found in homebrew
+* Dockerfiles - hadolint. Can be found in homebrew
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -26,7 +26,7 @@ provider "google" {
 module "gke" {
   source             = "../../"
   project_id         = "${var.project_id}"
-  name               = "${local.cluster_type}-cluster"
+  name               = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region             = "${var.region}"
   network            = "${var.network}"
   network_project_id = "${var.network_project_id}"

diff --git a/examples/disable_client_cert/test_outputs.tf b/examples/disable_client_cert/test_outputs.tf
diff --git a/examples/disable_client_cert/test_outputs.tf b/examples/disable_client_cert/test_outputs.tf
@@ -0,0 +1 @@
+../../test/fixtures/all_examples/test_outputs.tf
diff --git a/examples/disable_client_cert/variables.tf b/examples/disable_client_cert/variables.tf
@@ -22,6 +22,11 @@ variable "credentials_path" {
   description = "The path to the GCP credentials JSON file"
 }
 
+variable "cluster_name_suffix" {
+  description = "A suffix to append to the default cluster name"
+  default     = ""
+}
+
 variable "region" {
   description = "The region to host the cluster in"
 }

diff --git a/test/fixtures/disable_client_cert/example.tf b/test/fixtures/disable_client_cert/example.tf
@@ -19,6 +19,7 @@ module "example" {
 
   project_id                     = "${var.project_id}"
   credentials_path               = "${local.credentials_path}"
+  cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "${var.region}"
   network                        = "${google_compute_network.main.name}"
   network_project_id             = "${var.project_id}"