Skip to content

Commit 1697025

Browse files
Merge branch 'main' into fix-root-ca-sample
2 parents ac028dc + c9473b3 commit 1697025

File tree

22 files changed

+1314
-37
lines changed

22 files changed

+1314
-37
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525
/vertex_ai/ @terraform-google-modules/dee-data-ai @terraform-google-modules/terraform-samples-reviewers
2626
/vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
2727
/workflows/ @terraform-google-modules/torus-dpe @terraform-google-modules/terraform-samples-reviewers
28+
/managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.20
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.21
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424
DOCKER_BIN ?= docker

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ tags:
9292
- 'integration'
9393
substitutions:
9494
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
95-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20'
95+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ tags:
2222
- 'lint'
2323
substitutions:
2424
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
25-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20'
25+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* Copyright 2023 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
# [START compute_instances_quickstart]
18+
resource "google_compute_instance" "default" {
19+
name = "my-vm"
20+
machine_type = "n1-standard-1"
21+
zone = "us-central1-a"
22+
23+
boot_disk {
24+
initialize_params {
25+
image = "ubuntu-minimal-2210-kinetic-amd64-v20230126"
26+
}
27+
}
28+
29+
network_interface {
30+
network = "default"
31+
access_config {}
32+
}
33+
}
34+
# [END compute_instances_quickstart]
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/**
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Made to resemble
19+
* gcloud compute instance-groups managed create rmig-daof \
20+
* --template=template \
21+
* --size=3 \
22+
* --region=us-central1 \
23+
* --default-action-on-vm-failure=repair
24+
*/
25+
# [START compute_regional_instance_group_manager_daof_parent_tag]
26+
resource "google_compute_instance_template" "default" {
27+
name = "template"
28+
machine_type = "e2-medium"
29+
30+
disk {
31+
source_image = "debian-cloud/debian-11"
32+
}
33+
34+
network_interface {
35+
network = "default"
36+
}
37+
}
38+
# [START compute_regional_instance_group_manager_daof_tag]
39+
resource "google_compute_region_instance_group_manager" "default" {
40+
name = "rmig-daof"
41+
base_instance_name = "test"
42+
target_size = 3
43+
region = "us-central1"
44+
45+
version {
46+
instance_template = google_compute_instance_template.default.id
47+
name = "primary"
48+
}
49+
50+
instance_lifecycle_policy {
51+
default_action_on_failure = "REPAIR"
52+
}
53+
}
54+
# [END compute_regional_instance_group_manager_daof_tag]
55+
# [END compute_regional_instance_group_manager_daof_parent_tag]
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/**
2+
* Copyright 202 4Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Made to resemble:
19+
* gcloud compute instance-groups managed all-instances-config update mig-aic \
20+
* --metadata="key1"="value1","key2"="value2" \
21+
* --labels="key3"="value3","key4"="value4"
22+
*/
23+
24+
# [START compute_zonal_instance_group_manager_aic_parent_tag]
25+
resource "google_compute_instance_template" "default" {
26+
name = "some-instance-template"
27+
machine_type = "e2-medium"
28+
29+
disk {
30+
source_image = "debian-cloud/debian-11"
31+
}
32+
33+
network_interface {
34+
network = "default"
35+
}
36+
}
37+
# [START compute_zonal_instance_group_manager_aic_tag]
38+
resource "google_compute_instance_group_manager" "default" {
39+
40+
name = "mig-aic"
41+
base_instance_name = "test"
42+
zone = "us-central1-f"
43+
44+
version {
45+
instance_template = google_compute_instance_template.default.id
46+
name = "primary"
47+
}
48+
49+
all_instances_config {
50+
metadata = {
51+
key1 = "value1",
52+
key2 = "value2"
53+
}
54+
labels = {
55+
key3 = "value3",
56+
key4 = "value4"
57+
}
58+
}
59+
}
60+
# [END compute_zonal_instance_group_manager_aic_tag]
61+
# [END compute_zonal_instance_group_manager_aic_parent_tag]
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/**
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Made to resemble
19+
* gcloud compute instance-groups managed create mig-daof \
20+
* --template=template \
21+
* --size=3 \
22+
* --zone=us-central1-f \
23+
* --default-action-on-vm-failure=do_nothing
24+
*/
25+
# [START compute_zonal_instance_group_manager_daof_parent_tag]
26+
resource "google_compute_instance_template" "default" {
27+
name = "template"
28+
machine_type = "e2-medium"
29+
30+
disk {
31+
source_image = "debian-cloud/debian-11"
32+
}
33+
34+
network_interface {
35+
network = "default"
36+
}
37+
}
38+
# [START compute_zonal_instance_group_manager_daof_tag]
39+
resource "google_compute_instance_group_manager" "default" {
40+
name = "mig-daof"
41+
base_instance_name = "test"
42+
target_size = 3
43+
zone = "us-central1-f"
44+
45+
version {
46+
instance_template = google_compute_instance_template.default.id
47+
name = "primary"
48+
}
49+
50+
instance_lifecycle_policy {
51+
default_action_on_failure = "DO_NOTHING"
52+
}
53+
}
54+
# [END compute_zonal_instance_group_manager_daof_tag]
55+
# [END compute_zonal_instance_group_manager_daof_parent_tag]
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/**
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
/** Made to resemble
17+
* gcloud beta compute instance-groups managed update standby-mig \
18+
* --standby-policy-mode=scale-out-pool \
19+
* --standby-policy-initial-delay=50 \
20+
* --zone=us-central1-f
21+
*/
22+
# [START compute_zonal_instance_group_manager_standby_policy_parent_tag]
23+
resource "google_compute_instance_template" "default" {
24+
name = "an-instance-template"
25+
machine_type = "e2-medium"
26+
27+
disk {
28+
source_image = "debian-cloud/debian-11"
29+
}
30+
31+
network_interface {
32+
network = "default"
33+
}
34+
}
35+
36+
# [START compute_zonal_instance_group_manager_standby_policy_tag]
37+
resource "google_compute_instance_group_manager" "default" {
38+
provider = google-beta
39+
name = "standby-mig"
40+
base_instance_name = "test"
41+
target_size = 3
42+
zone = "us-central1-f"
43+
44+
version {
45+
instance_template = google_compute_instance_template.default.id
46+
name = "primary"
47+
}
48+
standby_policy {
49+
initial_delay_sec = 50
50+
mode = "SCALE_OUT_POOL"
51+
}
52+
}
53+
# [END compute_zonal_instance_group_manager_standby_policy_tag]
54+
# [END compute_zonal_instance_group_manager_standby_policy_parent_tag]

0 commit comments

Comments
 (0)