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

Commit

Permalink
Changes for Forseti module release 5.1.3 (#524)
Browse files Browse the repository at this point in the history
* Update forseti version to 2.24.2.

* Update changelog

* Update changelog
  • Loading branch information
gkowalski-google authored Feb 25, 2020
1 parent 8e1efcb commit 0970825
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 26 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Extending the adopted spec, each change should have a link to its corresponding pull request appended.

## [5.1.3] - 2020-02-25

### Added

- Support for Forseti v2.24.2 [#524]

## [5.1.2] - 2020-02-07

### Added
Expand All @@ -16,7 +22,7 @@ Extending the adopted spec, each change should have a link to its corresponding

### Added

- Support for Forseti v2.24.1 [#386]
- Support for Forseti v2.24.0 [#386]
- Parameterized Kubernetes version [#385]
- GCS bucket location to tutorials and examples [#382]
- Improved existing resource import in v5.0.0 [#354]
Expand Down Expand Up @@ -324,7 +330,9 @@ Version 4.0.0 is a backwards-incompatible release. Please see the [upgrade instr
[v5.1.0]: https://github.com/terraform-google-modules/terraform-google-forseti/compare/v5.0.0...v5.1.0
[v5.1.1]: https://github.com/terraform-google-modules/terraform-google-forseti/compare/v5.1.0...v5.1.1
[v5.1.2]: https://github.com/terraform-google-modules/terraform-google-forseti/compare/v5.1.1...v5.1.2
[v5.1.3]: https://github.com/terraform-google-modules/terraform-google-forseti/compare/v5.1.2...v5.1.3

[#524]: https://github.com/forseti-security/terraform-google-forseti/pull/524
[#499]: https://github.com/forseti-security/terraform-google-forseti/pull/499
[#386]: https://github.com/forseti-security/terraform-google-forseti/pull/386
[#385]: https://github.com/forseti-security/terraform-google-forseti/pull/385
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ A Google Cloud Shell Walkthrough has been setup to make it easy for users who ar

If you are familiar with Terraform and would like to run Terraform from a different machine, you can skip this walkthrough and move onto the [How to Deploy](#how-to-deploy) section.

[![Open in Google Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fforseti-security%2Fterraform-google-forseti.git&cloudshell_git_branch=modulerelease511&cloudshell_working_dir=examples/install_simple&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&cloudshell_tutorial=.%2Ftutorial.md)
[![Open in Google Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fforseti-security%2Fterraform-google-forseti.git&cloudshell_git_branch=modulerelease513&cloudshell_working_dir=examples/install_simple&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&cloudshell_tutorial=.%2Ftutorial.md)

## How to Deploy
In order to run this module you will need to be authenticated as a user that has access to the project and can create/authorize service accounts at both the organization and project levels. To login to GCP from a shell:
Expand All @@ -20,7 +20,7 @@ gcloud auth login
The repository has several helper scripts that can be used with the deployment process.

```bash
git clone --branch modulerelease511 --depth 1 https://github.com/forseti-security/terraform-google-forseti.git
git clone --branch modulerelease513 --depth 1 https://github.com/forseti-security/terraform-google-forseti.git
```

### Install Terraform
Expand Down Expand Up @@ -238,7 +238,7 @@ For this module to work, you need the following APIs enabled on the Forseti proj
| forseti\_home | Forseti installation directory | string | `"$USER_HOME/forseti-security"` | no |
| forseti\_repo\_url | Git repo for the Forseti installation | string | `"https://github.com/forseti-security/forseti-security"` | no |
| forseti\_run\_frequency | Schedule of running the Forseti scans | string | `"null"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.1"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.2"` | no |
| forwarding\_rule\_enabled | Forwarding rule scanner enabled. | bool | `"false"` | no |
| forwarding\_rule\_violations\_should\_notify | Notify for forwarding rule violations | bool | `"true"` | no |
| group\_enabled | Group scanner enabled. | bool | `"true"` | no |
Expand Down
2 changes: 1 addition & 1 deletion examples/install_simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This configuration is used to simply install Forseti. It includes a full Cloud Shell [tutorial](./tutorial.md).

[![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fforseti-security%2Fterraform-google-forseti.git&cloudshell_git_branch=modulerelease511&cloudshell_working_dir=examples/install_simple&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&cloudshell_tutorial=.%2Ftutorial.md)
[![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fforseti-security%2Fterraform-google-forseti.git&cloudshell_git_branch=modulerelease513&cloudshell_working_dir=examples/install_simple&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&cloudshell_tutorial=.%2Ftutorial.md)

<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs
Expand Down
4 changes: 2 additions & 2 deletions examples/on_gke_end_to_end/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ This script will also activate necessary APIs required for Terraform to deploy F
| gsuite\_admin\_email | G-Suite administrator email address to manage your Forseti installation | string | n/a | yes |
| helm\_repository\_url | The Helm repository containing the 'forseti-security' Helm charts | string | `"https://forseti-security-charts.storage.googleapis.com/release/"` | no |
| k8s\_forseti\_namespace | The Kubernetes namespace in which to deploy Forseti. | string | `"forseti"` | no |
| k8s\_forseti\_orchestrator\_image\_tag | The tag for the container image for the Forseti orchestrator | string | `"v2.24.1"` | no |
| k8s\_forseti\_server\_image\_tag | The tag for the container image for the Forseti server | string | `"v2.24.1"` | no |
| k8s\_forseti\_orchestrator\_image\_tag | The tag for the container image for the Forseti orchestrator | string | `"v2.24.2"` | no |
| k8s\_forseti\_server\_image\_tag | The tag for the container image for the Forseti server | string | `"v2.24.2"` | no |
| k8s\_tiller\_sa\_name | The Kubernetes Service Account used by Tiller | string | `"tiller"` | no |
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | string | `"1.13.12-gke.8"` | no |
| network | The name of the VPC being created | string | `"forseti-gke-network"` | no |
Expand Down
4 changes: 2 additions & 2 deletions examples/on_gke_end_to_end/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ variable "k8s_tiller_sa_name" {

variable "k8s_forseti_orchestrator_image_tag" {
description = "The tag for the container image for the Forseti orchestrator"
default = "v2.24.1"
default = "v2.24.2"
}

variable "k8s_forseti_server_image_tag" {
description = "The tag for the container image for the Forseti server"
default = "v2.24.1"
default = "v2.24.2"
}

variable "kubernetes_version" {
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This example illustrates how to set up a Forseti installation with shared VPC.
| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| domain | Organization domain | string | n/a | yes |
| forseti\_version | The version of Forseti to install | string | `"v2.24.1"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.2"` | no |
| gsuite\_admin\_email | G Suite admin email | string | n/a | yes |
| instance\_metadata | Metadata key/value pairs to make available from within the client and server instances. | map(string) | `<map>` | no |
| network | Name of the shared VPC | string | n/a | yes |
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "network_project" {
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This example illustrates how to set up a minimal Forseti installation.
| domain | The domain associated with the GCP Organization ID | string | n/a | yes |
| forseti\_email\_recipient | Forseti email recipient. | string | `""` | no |
| forseti\_email\_sender | Forseti email sender. | string | `""` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.1"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.2"` | no |
| gsuite\_admin\_email | The email of a GSuite super admin, used for pulling user directory information *and* sending notifications. | string | n/a | yes |
| instance\_metadata | Metadata key/value pairs to make available from within the client and server instances. | map(string) | `<map>` | no |
| instance\_tags | Tags to assign the client and server instances. | list(string) | `<list>` | no |
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_example/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "gsuite_admin_email" {
Expand Down
2 changes: 1 addition & 1 deletion modules/client/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ variable "project_id" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "forseti_repo_url" {
Expand Down
6 changes: 3 additions & 3 deletions modules/on_gke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ This sub-module deploys Forseti on GKE. In short, this deploys a server contain
| forseti\_home | Forseti installation directory | string | `"$USER_HOME/forseti-security"` | no |
| forseti\_repo\_url | Git repo for the Forseti installation | string | `"https://github.com/forseti-security/forseti-security"` | no |
| forseti\_run\_frequency | Schedule of running the Forseti scans | string | `"null"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.1"` | no |
| forseti\_version | The version of Forseti to install | string | `"v2.24.2"` | no |
| forwarding\_rule\_enabled | Forwarding rule scanner enabled. | bool | `"false"` | no |
| forwarding\_rule\_violations\_should\_notify | Notify for forwarding rule violations | bool | `"true"` | no |
| git\_sync\_image | The container image used by the config-validator git-sync side-car | string | `"gcr.io/google-containers/git-sync"` | no |
Expand Down Expand Up @@ -113,9 +113,9 @@ This sub-module deploys Forseti on GKE. In short, this deploys a server contain
| k8s\_config\_validator\_image\_tag | The tag for the config-validator image. | string | `"572e207"` | no |
| k8s\_forseti\_namespace | The Kubernetes namespace in which to deploy Forseti. | string | `"forseti"` | no |
| k8s\_forseti\_orchestrator\_image | The container image for the Forseti orchestrator | string | `"gcr.io/forseti-containers/forseti"` | no |
| k8s\_forseti\_orchestrator\_image\_tag | The tag for the container image for the Forseti orchestrator | string | `"v2.24.1"` | no |
| k8s\_forseti\_orchestrator\_image\_tag | The tag for the container image for the Forseti orchestrator | string | `"v2.24.2"` | no |
| k8s\_forseti\_server\_image | The container image for the Forseti server | string | `"gcr.io/forseti-containers/forseti"` | no |
| k8s\_forseti\_server\_image\_tag | The tag for the container image for the Forseti server | string | `"v2.24.1"` | no |
| k8s\_forseti\_server\_image\_tag | The tag for the container image for the Forseti server | string | `"v2.24.2"` | no |
| k8s\_forseti\_server\_ingress\_cidr | If network_policy is true, k8s_forseti_server_ingress_cidr will restrict connections to the Forseti Server service from the CIDR's specified | string | `""` | no |
| k8s\_tiller\_sa\_name | The Kubernetes Service Account used by Tiller | string | `"tiller"` | no |
| ke\_scanner\_enabled | KE scanner enabled. | bool | `"false"` | no |
Expand Down
6 changes: 3 additions & 3 deletions modules/on_gke/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ variable "gsuite_admin_email" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "forseti_repo_url" {
Expand Down Expand Up @@ -890,7 +890,7 @@ variable "k8s_forseti_orchestrator_image" {

variable "k8s_forseti_orchestrator_image_tag" {
description = "The tag for the container image for the Forseti orchestrator"
default = "v2.24.1"
default = "v2.24.2"
}

variable "k8s_forseti_server_image" {
Expand All @@ -900,7 +900,7 @@ variable "k8s_forseti_server_image" {

variable "k8s_forseti_server_image_tag" {
description = "The tag for the container image for the Forseti server"
default = "v2.24.1"
default = "v2.24.2"
}

variable "k8s_forseti_server_ingress_cidr" {
Expand Down
2 changes: 1 addition & 1 deletion modules/server/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ variable "project_id" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "forseti_repo_url" {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/shared_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variable "domain" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "gsuite_admin_email" {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/simple_example/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ variable "gsuite_admin_email" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "instance_metadata" {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/simple_example/controls/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
require "yaml"

forseti_server_vm_ip = attribute("forseti-server-vm-ip")
forseti_version = "2.24.1"
forseti_version = "2.24.2"

control "client" do
title "Forseti client instance resources"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/simple_example/controls/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

require "yaml"

forseti_version = "2.24.1"
forseti_version = "2.24.2"

control "server" do
title "Forseti server instance resources"
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "gsuite_admin_email" {

variable "forseti_version" {
description = "The version of Forseti to install"
default = "v2.24.1"
default = "v2.24.2"
}

variable "forseti_repo_url" {
Expand Down

0 comments on commit 0970825

Please sign in to comment.