Skip to content
This repository has been archived by the owner on Oct 20, 2023. It is now read-only.

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
gkowalski-google committed Mar 9, 2020
1 parent 0348958 commit 4fc5019
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
6 changes: 6 additions & 0 deletions examples/on_gke_end_to_end/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) | `<map>` | 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 |
Expand Down Expand Up @@ -97,16 +98,21 @@ 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 |
| forseti-client-vm-ip | Forseti Client VM private IP address |
| 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 |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
10 changes: 5 additions & 5 deletions examples/on_gke_end_to_end/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion modules/on_gke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
8 changes: 4 additions & 4 deletions test/fixtures/on_gke_end_to_end/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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
}

0 comments on commit 4fc5019

Please sign in to comment.