Skip to content

Commit c3abc08

Browse files
authored
chore: update examples to use registry (#1821)
1 parent 46a4090 commit c3abc08

File tree

38 files changed

+123
-41
lines changed

38 files changed

+123
-41
lines changed

build/int.cloudbuild.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
timeout: 12600s
1616
steps:
17+
- id: swap-module-refs
18+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
19+
args: ['module-swapper']
1720
- id: prepare
1821
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
1922
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment ; chmod 600 /builder/home/.netrc && sleep 120']

examples/deploy_service/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
region = var.region

examples/disable_client_cert/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
3132

3233
project_id = var.project_id
3334
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"

examples/node_pool/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../modules/beta-public-cluster/"
30+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
region = var.region

examples/node_pool/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@ variable "cluster_autoscaling" {
8080
auto_upgrade = true
8181
}
8282
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
83+
8384
}

examples/node_pool_update_variant/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ provider "kubernetes" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/private-cluster-update-variant"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster-update-variant"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3941
regional = false

examples/node_pool_update_variant_beta/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ provider "kubernetes" {
3838
}
3939

4040
module "gke" {
41-
source = "../../modules/beta-private-cluster-update-variant"
41+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster-update-variant"
42+
version = "~> 29.0"
43+
4244
project_id = var.project_id
4345
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
4446
regional = false

examples/node_pool_update_variant_public_beta/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ provider "kubernetes" {
3838
}
3939

4040
module "gke" {
41-
source = "../../modules/beta-public-cluster-update-variant"
41+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster-update-variant"
42+
version = "~> 29.0"
43+
4244
project_id = var.project_id
4345
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
4446
region = var.region

examples/private_zonal_with_networking/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ data "google_compute_subnetwork" "subnetwork" {
6060
}
6161

6262
module "gke" {
63-
source = "../../modules/private-cluster/"
63+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
64+
version = "~> 29.0"
65+
6466
project_id = var.project_id
6567
name = var.cluster_name
6668
regional = false

examples/regional_private_node_pool_oauth_scopes/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "gke" {
18-
source = "../../modules/private-cluster"
18+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
19+
version = "~> 29.0"
20+
1921
project_id = var.project_id
2022
name = "random-test-cluster"
2123
region = "us-west1"

examples/safer_cluster/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ resource "random_shuffle" "version" {
5151
}
5252

5353
module "gke" {
54-
source = "../../modules/safer-cluster/"
54+
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
55+
version = "~> 29.0"
56+
5557
project_id = var.project_id
5658
name = "${local.cluster_type}-cluster-${random_string.suffix.result}"
5759
regional = true

examples/safer_cluster_iap_bastion/cluster.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
module "gke" {
18-
source = "../../modules/safer-cluster"
18+
source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster"
19+
version = "~> 29.0"
1920

2021
project_id = module.enabled_google_apis.project_id
2122
name = var.cluster_name

examples/shared_vpc/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
region = var.region

examples/simple_autopilot_private/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ provider "kubernetes" {
3434
}
3535

3636
module "gke" {
37-
source = "../../modules/beta-autopilot-private-cluster/"
37+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
38+
version = "~> 29.0"
39+
3840
project_id = var.project_id
3941
name = "${local.cluster_type}-cluster"
4042
regional = true

examples/simple_autopilot_private_non_default_sa/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ provider "kubernetes" {
3434
}
3535

3636
module "gke" {
37-
source = "../../modules/beta-autopilot-private-cluster/"
37+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
38+
version = "~> 29.0"
39+
3840
project_id = var.project_id
3941
name = "${local.cluster_type}-cluster"
4042
regional = true

examples/simple_autopilot_public/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ provider "kubernetes" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/beta-autopilot-public-cluster/"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster"
3941
regional = true

examples/simple_regional/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
regional = true

examples/simple_regional_beta/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../modules/beta-public-cluster/"
30+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
regional = var.regional

examples/simple_regional_private/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/private-cluster/"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3941
regional = true

examples/simple_regional_private_beta/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/beta-private-cluster/"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3941
regional = true

examples/simple_regional_private_with_cluster_version/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/private-cluster/"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3941
regional = true

examples/simple_regional_with_gateway_api/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
regional = true

examples/simple_regional_with_kubeconfig/main.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
regional = true
@@ -42,7 +44,8 @@ module "gke" {
4244
}
4345

4446
module "gke_auth" {
45-
source = "../../modules/auth"
47+
source = "terraform-google-modules/kubernetes-engine/google//modules/auth"
48+
version = "~> 29.0"
4649

4750
project_id = var.project_id
4851
location = module.gke.location

examples/simple_regional_with_networking/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ module "gcp-network" {
5252
}
5353

5454
module "gke" {
55-
source = "../../"
55+
source = "terraform-google-modules/kubernetes-engine/google"
56+
version = "~> 29.0"
57+
5658
project_id = var.project_id
5759
name = var.cluster_name
5860
regional = true

examples/simple_windows_node_pool/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../modules/beta-public-cluster/"
30+
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
regional = false
3335
region = var.region

examples/simple_zonal_private/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ data "google_compute_subnetwork" "subnetwork" {
3333
}
3434

3535
module "gke" {
36-
source = "../../modules/private-cluster/"
36+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
37+
version = "~> 29.0"
38+
3739
project_id = var.project_id
3840
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3941
regional = false

examples/simple_zonal_with_acm/acm.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "acm" {
18-
source = "../../modules/acm"
18+
source = "terraform-google-modules/kubernetes-engine/google//modules/acm"
19+
version = "~> 29.0"
20+
1921
project_id = var.project_id
2022
location = module.gke.location
2123
cluster_name = module.gke.name

examples/simple_zonal_with_acm/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ provider "kubernetes" {
3131
}
3232

3333
module "gke" {
34-
source = "../../"
34+
source = "terraform-google-modules/kubernetes-engine/google"
35+
version = "~> 29.0"
36+
3537
project_id = var.project_id
3638
regional = false
3739
region = var.region

examples/simple_zonal_with_asm/main.tf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ data "google_project" "project" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "test-prefix-cluster-test-suffix"
3335
regional = false
@@ -54,7 +56,9 @@ module "gke" {
5456
}
5557

5658
module "asm" {
57-
source = "../../modules/asm"
59+
source = "terraform-google-modules/kubernetes-engine/google//modules/asm"
60+
version = "~> 29.0"
61+
5862
project_id = var.project_id
5963
cluster_name = module.gke.name
6064
cluster_location = module.gke.location

examples/simple_zonal_with_hub/hub.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "hub" {
18-
source = "../../modules/fleet-membership"
18+
source = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership"
19+
version = "~> 29.0"
20+
1921
project_id = var.project_id
2022
location = module.gke.location
2123
cluster_name = module.gke.name

examples/simple_zonal_with_hub/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
regional = false
3335
region = var.region

examples/simple_zonal_with_hub_kubeconfig/hub.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
module "hub" {
18-
source = "../../modules/hub-legacy"
18+
source = "terraform-google-modules/kubernetes-engine/google//modules/hub-legacy"
19+
version = "~> 29.0"
20+
1921
project_id = var.project_id
2022
location = "remote"
2123
cluster_name = kind_cluster.test-cluster.name

examples/stub_domains/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
region = var.region

examples/stub_domains_private/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ data "google_compute_subnetwork" "subnetwork" {
2929
}
3030

3131
module "gke" {
32-
source = "../../modules/private-cluster"
32+
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
33+
version = "~> 29.0"
3334

3435
ip_range_pods = var.ip_range_pods
3536
ip_range_services = var.ip_range_services

examples/stub_domains_upstream_nameservers/main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ provider "kubernetes" {
2727
}
2828

2929
module "gke" {
30-
source = "../../"
30+
source = "terraform-google-modules/kubernetes-engine/google"
31+
version = "~> 29.0"
32+
3133
project_id = var.project_id
3234
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3335
region = var.region

0 commit comments

Comments
 (0)