kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compute-vm: add resource manager tags support for instance templates (#1982)

Browse Source
This commit is contained in:
Luca Prete
2024-01-16 18:40:15 +01:00
committed by GitHub
parent e5de2ed31f
commit bc506795f2
79 changed files with 256 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/compute-vm/main.tf
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2023 Google LLC
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -334,25 +334,27 @@ resource "google_compute_instance_iam_binding" "default" {
}
resource "google_compute_instance_template" "default" {
provider = google-beta
count = var.create_template ? 1 : 0
project = var.project_id
region = local.region
name_prefix = "${var.name}-"
description = var.description
tags = var.tags
machine_type = var.instance_type
min_cpu_platform = var.min_cpu_platform
can_ip_forward = var.can_ip_forward
metadata = var.metadata
labels = var.labels
provider = google-beta
count = var.create_template ? 1 : 0
project = var.project_id
region = local.region
name_prefix = "${var.name}-"
description = var.description
tags = var.tags
machine_type = var.instance_type
min_cpu_platform = var.min_cpu_platform
can_ip_forward = var.can_ip_forward
metadata = var.metadata
labels = var.labels
resource_manager_tags = local.tags_combined
disk {
auto_delete = var.boot_disk.auto_delete
boot = true
disk_size_gb = var.boot_disk.initialize_params.size
disk_type = var.boot_disk.initialize_params.type
source_image = var.boot_disk.initialize_params.image
auto_delete = var.boot_disk.auto_delete
boot = true
disk_size_gb = var.boot_disk.initialize_params.size
disk_type = var.boot_disk.initialize_params.type
resource_manager_tags = var.tag_bindings
source_image = var.boot_disk.initialize_params.image
}
dynamic "confidential_instance_config" {
@@ -386,7 +388,8 @@ resource "google_compute_instance_template" "default" {
disk_name = (
config.value.source_type != "attach" ? config.value.name : null
)
type = "PERSISTENT"
resource_manager_tags = var.tag_bindings
type = "PERSISTENT"
dynamic "disk_encryption_key" {
for_each = var.encryption != null ? [""] : []
content {

6
modules/compute-vm/versions.tf
View File

@@ -1,4 +1,4 @@
# Copyright 2023 Google LLC
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.10.0, < 6.0.0" # tftest
version = ">= 5.11.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.10.0, < 6.0.0" # tftest
version = ">= 5.11.0, < 6.0.0" # tftest
}
}
}