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.

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

Add GKE Resource Consumption Metering, promote resource export to GA #3303

Merged

Conversation

rileykarson
Copy link
Member

Fixes hashicorp/terraform-provider-google#4634, supersedes #2705

Test changes are a little messy, I got rid of a conditional block and made it two cases instead.

Release Note Template for Downstream PRs (will be copied)

container: added `resource_usage_export_config` to `google_container_cluster`, previously only available in `google-beta` (ga only)
container: added `enable_resource_consumption_metering` to `resource_usage_export_config` in `google_container_cluster` (beta only)

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 201 insertions(+))
Terraform Beta: Diff ( 3 files changed, 58 insertions(+), 16 deletions(-))

@morgante
Copy link

I think this file also needs to be updated: https://github.com/GoogleCloudPlatform/magic-modules/blob/master/third_party/validator/container.go

Somewhat off topic, but I thought we had some CI which would detect drift in manually written resources for conversion?

Copy link
Contributor

@megan07 megan07 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

resource_usage_export_config {
enable_network_egress_metering = true

enable_resource_consumption_metering = %s
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: indentation

@rileykarson
Copy link
Member Author

rileykarson commented Mar 26, 2020

@morgante: Filed hashicorp/terraform-provider-google#5988 to resync container cluster, hashicorp/terraform-provider-google#5989 to get the Magician to warn us again

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 201 insertions(+))
Terraform Beta: Diff ( 3 files changed, 58 insertions(+), 16 deletions(-))

@morgante
Copy link

Thanks @rileykarson!

nathkn pushed a commit to nathkn/magic-modules that referenced this pull request May 18, 2020
…leCloudPlatform#3303)

* Add GKE Resource Consumption Metering, promote resource export to GA

* Add docs

* Spacing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

resource_usage_export_config in google_container_cluster should be supported in GA provider
5 participants