chore: update for new nodeImageConfig block (#2599)

apeabody · web-flow · commit 47615703715c · 2026-06-05T17:42:00.000-05:00
diff --git a/test/integration/beta_cluster/beta_cluster_test.go b/test/integration/beta_cluster/beta_cluster_test.go
@@ -42,9 +42,7 @@ func TestBetaCluster(t *testing.T) {
 		op := gcloud.Runf(t, "beta container clusters describe %s --zone %s --project %s", clusterName, location, projectId)
 		// save output as goldenfile
 		g := golden.NewOrUpdate(t, op.String(),
-			golden.WithSanitizer(golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")),
-			golden.WithSanitizer(golden.StringSanitizer(projectId, "PROJECT_ID")),
-			golden.WithSanitizer(golden.StringSanitizer(clusterName, "CLUSTER_NAME")),
+			golden.WithSanitizer(testutils.GKEClusterSanitizer(serviceAccount, projectId, clusterName, op)),
 		)
 		// assert json paths against goldenfile data
 		validateJSONPaths := []string{
diff --git a/test/integration/beta_cluster/testdata/TestBetaCluster.json b/test/integration/beta_cluster/testdata/TestBetaCluster.json
@@ -165,6 +165,10 @@
         "metadata": {
           "disable-legacy-endpoints": "true"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/userinfo.email",
           "https://www.googleapis.com/auth/cloud-platform"
@@ -235,6 +239,10 @@
           "disable-legacy-endpoints": "true",
           "node_pool": "pool-01"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/cloud-platform"
         ],
diff --git a/test/integration/private_zonal_with_networking/private_zonal_with_networking_test.go b/test/integration/private_zonal_with_networking/private_zonal_with_networking_test.go
@@ -51,9 +51,7 @@ func TestPrivateZonalWithNetworking(t *testing.T) {
 		op := gcloud.Runf(t, "container clusters describe %s --zone %s --project %s", clusterName, location, projectId)
 
 		g := golden.NewOrUpdate(t, op.String(),
-			golden.WithSanitizer(golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")),
-			golden.WithSanitizer(golden.StringSanitizer(projectId, "PROJECT_ID")),
-			golden.WithSanitizer(golden.StringSanitizer(clusterName, "CLUSTER_NAME")),
+			golden.WithSanitizer(testutils.GKEClusterSanitizer(serviceAccount, projectId, clusterName, op)),
 		)
 		assert.Equal(peeringName, op.Get("privateClusterConfig.peeringName").String(), "has the correct PeeringName")
 		validateJSONPaths := []string{
diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
@@ -162,6 +162,10 @@
         "metadata": {
           "disable-legacy-endpoints": "true"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/userinfo.email",
           "https://www.googleapis.com/auth/cloud-platform"
@@ -240,6 +244,10 @@
           "disable-legacy-endpoints": "true",
           "node_pool": "default-node-pool"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/cloud-platform"
         ],
diff --git a/test/integration/simple_regional/simple_regional_test.go b/test/integration/simple_regional/simple_regional_test.go
@@ -40,9 +40,7 @@ func TestSimpleRegional(t *testing.T) {
 
 		op := gcloud.Runf(t, "container clusters describe %s --zone %s --project %s", clusterName, location, projectId)
 		g := golden.NewOrUpdate(t, op.String(),
-			golden.WithSanitizer(golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")),
-			golden.WithSanitizer(golden.StringSanitizer(projectId, "PROJECT_ID")),
-			golden.WithSanitizer(golden.StringSanitizer(clusterName, "CLUSTER_NAME")),
+			golden.WithSanitizer(testutils.GKEClusterSanitizer(serviceAccount, projectId, clusterName, op)),
 		)
 		validateJSONPaths := []string{
 			"status",
diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json
@@ -175,6 +175,10 @@
         "metadata": {
           "disable-legacy-endpoints": "true"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/userinfo.email",
           "https://www.googleapis.com/auth/cloud-platform"
@@ -252,6 +256,10 @@
           "disable-legacy-endpoints": "true",
           "node_pool": "default-node-pool"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/cloud-platform"
         ],
diff --git a/test/integration/simple_regional_additional_ip_ranges/simple_regional_additional_ip_ranges_test.go b/test/integration/simple_regional_additional_ip_ranges/simple_regional_additional_ip_ranges_test.go
@@ -40,9 +40,7 @@ func TestSimpleRegionalAdditionalIPRanges(t *testing.T) {
 
 		op := gcloud.Runf(t, "container clusters describe %s --region %s --project %s", clusterName, location, projectId)
 		g := golden.NewOrUpdate(t, op.String(),
-			golden.WithSanitizer(golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")),
-			golden.WithSanitizer(golden.StringSanitizer(projectId, "PROJECT_ID")),
-			golden.WithSanitizer(golden.StringSanitizer(clusterName, "CLUSTER_NAME")),
+			golden.WithSanitizer(testutils.GKEClusterSanitizer(serviceAccount, projectId, clusterName, op)),
 		)
 		validateJSONPaths := []string{
 			"status",
diff --git a/test/integration/simple_regional_additional_ip_ranges/testdata/TestSimpleRegionalAdditionalIPRanges.json b/test/integration/simple_regional_additional_ip_ranges/testdata/TestSimpleRegionalAdditionalIPRanges.json
@@ -174,6 +174,10 @@
         "metadata": {
           "disable-legacy-endpoints": "true"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/userinfo.email",
           "https://www.googleapis.com/auth/cloud-platform"
@@ -251,6 +255,10 @@
           "disable-legacy-endpoints": "true",
           "node_pool": "default-node-pool"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/cloud-platform"
         ],
diff --git a/test/integration/simple_regional_cluster_autoscaling/simple_regional_cluster_autoscaling_test.go b/test/integration/simple_regional_cluster_autoscaling/simple_regional_cluster_autoscaling_test.go
@@ -37,9 +37,7 @@ func TestSimpleRegionalClusterAutoscaling(t *testing.T) {
 
 		op := gcloud.Runf(t, "container clusters describe %s --zone %s --project %s", clusterName, location, projectId)
 		g := golden.NewOrUpdate(t, op.String(),
-			golden.WithSanitizer(golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")),
-			golden.WithSanitizer(golden.StringSanitizer(projectId, "PROJECT_ID")),
-			golden.WithSanitizer(golden.StringSanitizer(clusterName, "CLUSTER_NAME")),
+			golden.WithSanitizer(testutils.GKEClusterSanitizer(serviceAccount, projectId, clusterName, op)),
 		)
 		validateJSONPaths := []string{
 			"location",
diff --git a/test/integration/simple_regional_cluster_autoscaling/testdata/TestSimpleRegionalClusterAutoscaling.json b/test/integration/simple_regional_cluster_autoscaling/testdata/TestSimpleRegionalClusterAutoscaling.json
@@ -167,6 +167,10 @@
         "metadata": {
           "disable-legacy-endpoints": "true"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/userinfo.email",
           "https://www.googleapis.com/auth/cloud-platform"
@@ -244,6 +248,10 @@
           "disable-legacy-endpoints": "true",
           "node_pool": "default-node-pool"
         },
+        "nodeImageConfig": {
+          "image": "NODE_IMAGE",
+          "imageProject": "gke-node-images"
+        },
         "oauthScopes": [
           "https://www.googleapis.com/auth/cloud-platform"
         ],
diff --git a/test/integration/testutils/utils.go b/test/integration/testutils/utils.go
@@ -15,6 +15,7 @@
 package testutils
 
 import (
+	"cmp"
 	"fmt"
 	"slices"
 	"strings"
@@ -112,3 +113,34 @@ func TGKEAssertGolden(assert *assert.Assertions, golden *golden.GoldenFile, clus
 		}
 	}
 }
+
+// GKEClusterSanitizer returns a Sanitizer that sanitizes common GKE cluster fields,
+// including dynamic node image versions.
+func GKEClusterSanitizer(serviceAccount, projectId, clusterName string, clusterJson gjson.Result) golden.Sanitizer {
+	return func(s string) string {
+		s = golden.StringSanitizer(serviceAccount, "SERVICE_ACCOUNT")(s)
+		s = golden.StringSanitizer(projectId, "PROJECT_ID")(s)
+		s = golden.StringSanitizer(clusterName, "CLUSTER_NAME")(s)
+
+		var images []string
+		for _, np := range clusterJson.Get("nodePools").Array() {
+			image := np.Get("config.nodeImageConfig.image").String()
+			if image != "" && !slices.Contains(images, image) {
+				images = append(images, image)
+			}
+		}
+
+		// Sort images by length descending to prevent substring collision
+		slices.SortFunc(images, func(a, b string) int {
+			return cmp.Compare(len(b), len(a))
+		})
+
+		for _, image := range images {
+			s = golden.StringSanitizer(image, "NODE_IMAGE")(s)
+		}
+		return s
+	}
+}
+
+
+
