Merge branch 'main' into fix-csr-api

GoogleCloudPlatform · Nov 15, 2024 · ebb49e2 · ebb49e2
2 parents 0bdc35d + 9ac999c
commit ebb49e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ SHELL := /usr/bin/env bash
 
 # release images are available at:
 # console.cloud.google.com/gcr/images/cloud-foundation-cicd/global/cft/developer-tools?project=cloud-foundation-cicd
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.16
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.17
 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
@@ -86,6 +86,6 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools-krm'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22.16'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22.17'
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/test/integration/anthos_attached_clusters_kind/anthos_attached_clusters_kind_test.go b/test/integration/anthos_attached_clusters_kind/anthos_attached_clusters_kind_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-const deploymentName = "istiod-asm-1225-1"
+const deploymentName = "istiod-asm-1226-2"
 
 func TestAACKind(t *testing.T) {
 	kind := tft.NewTFBlueprintTest(t)