Merge branch 'terraform-google-modules:master' into master

terraform-google-modules · Aug 2, 2024 · 9fa2f6b · 9fa2f6b
2 parents 653a6dd + 2316ce8
commit 9fa2f6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.21
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -60,4 +60,4 @@ tags:
 - 'bats'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
diff --git a/modules/ops-agent-policy/main.tf b/modules/ops-agent-policy/main.tf
@@ -54,7 +54,7 @@ resource "google_os_config_os_policy_assignment" "ops_agent_policy" {
     id                            = local.os_policies.id
     mode                          = local.os_policies.mode
     allow_no_resource_group_match = local.os_policies.allowNoResourceGroupMatch
-    description                   = "AUTO-GENERATED VALUE BY TERRAFORM, DO NOT EDIT! Enforces Ops Agent installation state."
+    description                   = "AUTO-GENERATED VALUE, DO NOT EDIT! | {\"packageState\":\"${var.agents_rule.package_state}\",\"version\":\"${var.agents_rule.version}\"}"
 
     dynamic "resource_groups" {
       for_each = local.os_policies.resourceGroups
@@ -340,7 +340,7 @@ resource "google_os_config_os_policy_assignment" "ops_agent_policy" {
     }
     min_wait_duration = "3s"
   }
-  description        = "AUTO-GENERATED VALUE BY TERRAFORM, DO NOT EDIT! | {\"packageState\":\"${var.agents_rule.package_state}\",\"version\":\"${var.agents_rule.version}\"}'"
+  description        = "Cloud Ops Policy Assignment via Terraform"
   project            = var.project
   skip_await_rollout = true
 }