Skip to content

Commit

Permalink
GKE cluster modules: add optional kube state metrics (#1682)
Browse files Browse the repository at this point in the history 
* `gke-cluster-standard`: add optional kube state metrics
* `gke-cluster-autopilot`: add optional kube state metrics

* FAST: add kube state metrics support for GKE
* blueprints/gke: add kube state metrics support

* Bump up the provider version to `v4.82.0`
  • Loading branch information
@olliefr
olliefr committed Sep 15, 2023
1 parent 0221198 commit 6eb862a
Show file tree
Hide file tree
Showing 111 changed files with 546 additions and 353 deletions.
6 changes: 3 additions & 3 deletions blueprints/apigee/bigquery-analytics/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/adfs/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/dns-shared-vpc/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/onprem-sa-key-management/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/packer-image-builder/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/quota-monitoring/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/data-solutions/bq-ml/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/data-solutions/data-playground/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions blueprints/factories/net-vpc-firewall-yaml/versions.tf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.80.0" # tftest
version = ">= 4.82.0" # tftest
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions blueprints/gke/autopilot/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@ module "cluster" {
# autopilot = true
# }
# monitoring_config = {
# # (Optional) control plane metrics
# enable_api_server_metrics = true
# enable_controller_manager_metrics = true
# enable_scheduler_metrics = true
# # (Optional) kube state metrics
# enable_daemonset_metrics = true
# enable_deployment_metrics = true
# enable_hpa_metrics = true
# enable_pod_metrics = true
# enable_statefulset_metrics = true
# enable_storage_metrics = true
# }
# cluster_autoscaling = {
# auto_provisioning_defaults = {
Expand Down

0 comments on commit 6eb862a

Please sign in to comment.