Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: add upgrade guide, update provider constraints #705

Merged
merged 3 commits into from
Apr 12, 2022
Merged

fix!: add upgrade guide, update provider constraints #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cafc569
fix!: add upgrade guide, update provider constraints
bharathkkb Apr 12, 2022
86c2660
Merge branch 'master' into fix-upgrade-guide
bharathkkb Apr 12, 2022
0a45d5c
Update README.md
bharathkkb Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ determining that location is as follows:
- [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0
- [jq](https://stedolan.github.io/jq/) >= 1.6
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
- [terraform-provider-google] plugin ~> 4.5
- [terraform-provider-google-beta] plugin ~> 4.5
- [terraform-provider-google] plugin ~> 4.11
- [terraform-provider-google-beta] plugin ~> 4.11
- [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired

### Permissions
Expand Down
33 changes: 33 additions & 0 deletions docs/upgrading_to_project_factory_v13.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,36 @@ Service accounts principles on which networkUser can be managed through `grant_n
Additional roles that are managed through `grant_network_role` variable.
- roles/container.hostServiceAgentUser on "serviceAccount:service-{PROJECT-NUMBER}@container-engine-robot.iam.gserviceaccount.com
- roles/composer.sharedVpcAgent on "service-{PROJECT-NUMBER}@cloudcomposer-accounts.iam.gserviceaccount.com"

### Add `dimensions` field to `consumer_quota` object

The `dimensions` field was added to the `consumer_quota` object.

```diff
module "project-factory" {
source = "terraform-google-modules/project-factory/google"
- version = "~> 12.0"
+ version = "~> 13.0"

name = "pf-test-1"
random_project_id = "true"
org_id = "1234567890"
usage_bucket_name = "pf-test-1-usage-report-bucket"
usage_bucket_prefix = "pf/test/1/integration"
billing_account = "ABCDEF-ABCDEF-ABCDEF"
consumer_quotas = [
{
service = "servicemanagement.googleapis.com"
metric = urlencode("servicemanagement.googleapis.com/default_requests")
limit = urlencode("/min/project")
+ dimensions = {}
value = "95"
}
]
}
```

### Google Cloud Platform Provider upgrade

The Project Factory module now requires version 4.11 or higher of the Google Cloud Platform Provider and 4.11 or higher of
the Google Cloud Platform Beta Provider.
4 changes: 2 additions & 2 deletions modules/gsuite_enabled/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
version = "~> 4.11"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
version = "~> 4.11"
}
gsuite = {
source = "DeviaVir/gsuite"
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.5"
version = "~> 4.11"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.5"
version = "~> 4.11"
}
}
provider_meta "google" {
Expand Down