From 4fc501976a277289cfffdcf3b380bb9b42120991 Mon Sep 17 00:00:00 2001 From: Gregg Kowalski Date: Mon, 9 Mar 2020 21:28:10 +0000 Subject: [PATCH] Fix lint issues --- examples/on_gke_end_to_end/README.md | 6 ++++++ examples/on_gke_end_to_end/outputs.tf | 10 +++++----- modules/on_gke/README.md | 2 +- test/fixtures/on_gke_end_to_end/outputs.tf | 8 ++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/examples/on_gke_end_to_end/README.md b/examples/on_gke_end_to_end/README.md index 457734bce..ab40dc42b 100644 --- a/examples/on_gke_end_to_end/README.md +++ b/examples/on_gke_end_to_end/README.md @@ -56,6 +56,7 @@ This script will also activate necessary APIs required for Terraform to deploy F |------|-------------|:----:|:-----:|:-----:| | auto\_create\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | bool | `"false"` | no | | bucket\_cai\_location | GCS CAI storage bucket location | string | `"us-central1"` | no | +| client\_instance\_metadata | Metadata key/value pairs to make available from within the client instance. | map(string) | `` | no | | config\_validator\_enabled | Config Validator scanner enabled. | bool | `"false"` | no | | cscc\_source\_id | Source ID for CSCC Beta API | string | `""` | no | | cscc\_violations\_enabled | Notify for CSCC violations | bool | `"false"` | no | @@ -97,6 +98,8 @@ This script will also activate necessary APIs required for Terraform to deploy F | Name | Description | |------|-------------| +| ca\_certificate | The cluster CA certificate | +| client\_token | The bearer token for auth | | config-validator-git-public-key-openssh | The public OpenSSH key generated to allow the Forseti Server to clone the policy library repository. | | forseti-client-service-account | Forseti Client service account | | forseti-client-storage-bucket | Forseti Client storage bucket | @@ -104,9 +107,12 @@ This script will also activate necessary APIs required for Terraform to deploy F | forseti-cloudsql-connection-name | Forseti CloudSQL Connection String | | forseti-server-service-account | Forseti Server service account | | forseti-server-storage-bucket | Forseti Server storage bucket | +| gke\_cluster\_location | Cluster location | +| gke\_cluster\_name | Cluster name | | kubernetes-forseti-namespace | The Kubernetes namespace in which Forseti is deployed | | kubernetes-forseti-server-ingress | The loadbalancer ingress address of the forseti-server service in GKE | | kubernetes-forseti-tiller-sa-name | The name of the service account deploying Forseti | +| kubernetes\_endpoint | The cluster endpoint | | suffix | The random suffix appended to Forseti resources | diff --git a/examples/on_gke_end_to_end/outputs.tf b/examples/on_gke_end_to_end/outputs.tf index 3a03192aa..7ee8e8424 100644 --- a/examples/on_gke_end_to_end/outputs.tf +++ b/examples/on_gke_end_to_end/outputs.tf @@ -16,8 +16,8 @@ output "client_token" { description = "The bearer token for auth" - sensitive = true - value = base64encode(data.google_client_config.default.access_token) + sensitive = true + value = base64encode(data.google_client_config.default.access_token) } output "ca_certificate" { @@ -67,13 +67,13 @@ output "gke_cluster_location" { output "gke_cluster_name" { description = "Cluster name" - value = var.gke_cluster_name + value = var.gke_cluster_name } output "kubernetes_endpoint" { description = "The cluster endpoint" - sensitive = true - value = module.gke.endpoint + sensitive = true + value = module.gke.endpoint } output "kubernetes-forseti-namespace" { diff --git a/modules/on_gke/README.md b/modules/on_gke/README.md index ceaefb1ad..0c1e1b82a 100644 --- a/modules/on_gke/README.md +++ b/modules/on_gke/README.md @@ -98,7 +98,7 @@ This sub-module deploys Forseti on GKE. In short, this deploys a server contain | groups\_settings\_violations\_should\_notify | Notify for groups settings violations | bool | `"true"` | no | | groups\_violations\_should\_notify | Notify for Groups violations | bool | `"true"` | no | | gsuite\_admin\_email | G-Suite administrator email address to manage your Forseti installation | string | `""` | no | -| helm\_chart\_version | The version of the Helm chart to use | string | `"2.1.0"` | no | +| helm\_chart\_version | The version of the Helm chart to use | string | `"2.2.0-rc1"` | no | | helm\_repository\_url | The Helm repository containing the 'forseti-security' Helm charts | string | `"https://forseti-security-charts.storage.googleapis.com/release/"` | no | | iam\_disable\_polling | Whether to disable polling for IAM API | bool | `"false"` | no | | iam\_max\_calls | Maximum calls that can be made to IAM API | string | `"90"` | no | diff --git a/test/fixtures/on_gke_end_to_end/outputs.tf b/test/fixtures/on_gke_end_to_end/outputs.tf index b6dbe410d..7fe449825 100644 --- a/test/fixtures/on_gke_end_to_end/outputs.tf +++ b/test/fixtures/on_gke_end_to_end/outputs.tf @@ -16,8 +16,8 @@ output "client_token" { description = "The bearer token for auth" - sensitive = true - value = module.forseti.client_token + sensitive = true + value = module.forseti.client_token } output "ca_certificate" { @@ -47,6 +47,6 @@ output "gke_project_id" { output "kubernetes_endpoint" { description = "The cluster endpoint" - sensitive = true - value = module.forseti.kubernetes_endpoint + sensitive = true + value = module.forseti.kubernetes_endpoint }