chore: update examples to use registry (#1821)

terraform-google-modules · Dec 21, 2023 · c3abc08 · c3abc08
1 parent 46a4090
commit c3abc08
Show file tree

Hide file tree

Showing 38 changed files with 123 additions and 41 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -14,6 +14,9 @@
 
 timeout: 12600s
 steps:
+- id: swap-module-refs
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['module-swapper']
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment ; chmod 600 /builder/home/.netrc && sleep 120']

diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source     = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id = var.project_id
   name       = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region     = var.region

diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -27,7 +27,8 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
 
   project_id               = var.project_id
   name                     = "${local.cluster_type}-cluster${var.cluster_name_suffix}"

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                            = "../../modules/beta-public-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
+  version = "~> 29.0"
+
   project_id                        = var.project_id
   name                              = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region                            = var.region

diff --git a/examples/node_pool/variables.tf b/examples/node_pool/variables.tf
@@ -80,4 +80,5 @@ variable "cluster_autoscaling" {
     auto_upgrade        = true
   }
   description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
+
 }
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
@@ -33,7 +33,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                  = "../../modules/private-cluster-update-variant"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster-update-variant"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   name                    = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                = false

diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
@@ -38,7 +38,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                  = "../../modules/beta-private-cluster-update-variant"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster-update-variant"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   name                    = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                = false

diff --git a/examples/node_pool_update_variant_public_beta/main.tf b/examples/node_pool_update_variant_public_beta/main.tf
@@ -38,7 +38,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                 = "../../modules/beta-public-cluster-update-variant"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster-update-variant"
+  version = "~> 29.0"
+
   project_id             = var.project_id
   name                   = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region                 = var.region

diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf
@@ -60,7 +60,9 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source     = "../../modules/private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
+
   project_id = var.project_id
   name       = var.cluster_name
   regional   = false

diff --git a/examples/regional_private_node_pool_oauth_scopes/main.tf b/examples/regional_private_node_pool_oauth_scopes/main.tf
@@ -15,7 +15,9 @@
  */
 
 module "gke" {
-  source                            = "../../modules/private-cluster"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
+
   project_id                        = var.project_id
   name                              = "random-test-cluster"
   region                            = "us-west1"

diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf
@@ -51,7 +51,9 @@ resource "random_shuffle" "version" {
 }
 
 module "gke" {
-  source                     = "../../modules/safer-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
+  version = "~> 29.0"
+
   project_id                 = var.project_id
   name                       = "${local.cluster_type}-cluster-${random_string.suffix.result}"
   regional                   = true

diff --git a/examples/safer_cluster_iap_bastion/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf
@@ -15,7 +15,8 @@
  */
 
 module "gke" {
-  source = "../../modules/safer-cluster"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
+  version = "~> 29.0"
 
   project_id              = module.enabled_google_apis.project_id
   name                    = var.cluster_name

diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                     = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id                 = var.project_id
   name                       = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region                     = var.region

diff --git a/examples/simple_autopilot_private/main.tf b/examples/simple_autopilot_private/main.tf
@@ -34,7 +34,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                          = "../../modules/beta-autopilot-private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
+  version = "~> 29.0"
+
   project_id                      = var.project_id
   name                            = "${local.cluster_type}-cluster"
   regional                        = true

diff --git a/examples/simple_autopilot_private_non_default_sa/main.tf b/examples/simple_autopilot_private_non_default_sa/main.tf
@@ -34,7 +34,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                          = "../../modules/beta-autopilot-private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
+  version = "~> 29.0"
+
   project_id                      = var.project_id
   name                            = "${local.cluster_type}-cluster"
   regional                        = true

diff --git a/examples/simple_autopilot_public/main.tf b/examples/simple_autopilot_public/main.tf
@@ -33,7 +33,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                          = "../../modules/beta-autopilot-public-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
+  version = "~> 29.0"
+
   project_id                      = var.project_id
   name                            = "${local.cluster_type}-cluster"
   regional                        = true

diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                      = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id                  = var.project_id
   name                        = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                    = true

diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                        = "../../modules/beta-public-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
+  version = "~> 29.0"
+
   project_id                    = var.project_id
   name                          = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                      = var.regional

diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source                    = "../../modules/private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
+
   project_id                = var.project_id
   name                      = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                  = true

diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source                  = "../../modules/beta-private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   name                    = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                = true

diff --git a/examples/simple_regional_private_with_cluster_version/main.tf b/examples/simple_regional_private_with_cluster_version/main.tf
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source                    = "../../modules/private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
+
   project_id                = var.project_id
   name                      = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                  = true

diff --git a/examples/simple_regional_with_gateway_api/main.tf b/examples/simple_regional_with_gateway_api/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                      = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id                  = var.project_id
   name                        = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                    = true

diff --git a/examples/simple_regional_with_kubeconfig/main.tf b/examples/simple_regional_with_kubeconfig/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                 = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id             = var.project_id
   name                   = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional               = true
@@ -42,7 +44,8 @@ module "gke" {
 }
 
 module "gke_auth" {
-  source = "../../modules/auth"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/auth"
+  version = "~> 29.0"
 
   project_id   = var.project_id
   location     = module.gke.location

diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf
@@ -52,7 +52,9 @@ module "gcp-network" {
 }
 
 module "gke" {
-  source                 = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id             = var.project_id
   name                   = var.cluster_name
   regional               = true

diff --git a/examples/simple_windows_node_pool/main.tf b/examples/simple_windows_node_pool/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source     = "../../modules/beta-public-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
+  version = "~> 29.0"
+
   project_id = var.project_id
   regional   = false
   region     = var.region

diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source                  = "../../modules/private-cluster/"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   name                    = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   regional                = false

diff --git a/examples/simple_zonal_with_acm/acm.tf b/examples/simple_zonal_with_acm/acm.tf
@@ -15,7 +15,9 @@
  */
 
 module "acm" {
-  source       = "../../modules/acm"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/acm"
+  version = "~> 29.0"
+
   project_id   = var.project_id
   location     = module.gke.location
   cluster_name = module.gke.name

diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf
@@ -31,7 +31,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source     = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id = var.project_id
   regional   = false
   region     = var.region

diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf
@@ -27,7 +27,9 @@ data "google_project" "project" {
 }
 
 module "gke" {
-  source                  = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   name                    = "test-prefix-cluster-test-suffix"
   regional                = false
@@ -54,7 +56,9 @@ module "gke" {
 }
 
 module "asm" {
-  source                    = "../../modules/asm"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/asm"
+  version = "~> 29.0"
+
   project_id                = var.project_id
   cluster_name              = module.gke.name
   cluster_location          = module.gke.location

diff --git a/examples/simple_zonal_with_hub/hub.tf b/examples/simple_zonal_with_hub/hub.tf
@@ -15,7 +15,9 @@
  */
 
 module "hub" {
-  source       = "../../modules/fleet-membership"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership"
+  version = "~> 29.0"
+
   project_id   = var.project_id
   location     = module.gke.location
   cluster_name = module.gke.name

diff --git a/examples/simple_zonal_with_hub/main.tf b/examples/simple_zonal_with_hub/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source     = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id = var.project_id
   regional   = false
   region     = var.region

diff --git a/examples/simple_zonal_with_hub_kubeconfig/hub.tf b/examples/simple_zonal_with_hub_kubeconfig/hub.tf
@@ -15,7 +15,9 @@
  */
 
 module "hub" {
-  source                  = "../../modules/hub-legacy"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/hub-legacy"
+  version = "~> 29.0"
+
   project_id              = var.project_id
   location                = "remote"
   cluster_name            = kind_cluster.test-cluster.name

diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                 = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id             = var.project_id
   name                   = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region                 = var.region

diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -29,7 +29,8 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source = "../../modules/private-cluster"
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
+  version = "~> 29.0"
 
   ip_range_pods     = var.ip_range_pods
   ip_range_services = var.ip_range_services

diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -27,7 +27,9 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source                 = "../../"
+  source  = "terraform-google-modules/kubernetes-engine/google"
+  version = "~> 29.0"
+
   project_id             = var.project_id
   name                   = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
   region                 = var.region
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,4 +80,5 @@ variable "cluster_autoscaling" { @@
         auto_upgrade        = true
       }
       description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
     }