diff --git a/cli/Makefile b/cli/Makefile
index 3c2cf6bfe6a..e19f3197a8e 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 # Changing this value will trigger a new release
-VERSION=v1.2.9
+VERSION=v1.2.10
 BINARY=bin/cft
 GITHUB_REPO=github.com/GoogleCloudPlatform/cloud-foundation-toolkit
 PLATFORMS := linux windows darwin
diff --git a/cli/bpmetadata/bpmetadata_ui_ext.pb.go b/cli/bpmetadata/bpmetadata_ui_ext.pb.go
index 848f95cea1a..2a7817577c2 100644
--- a/cli/bpmetadata/bpmetadata_ui_ext.pb.go
+++ b/cli/bpmetadata/bpmetadata_ui_ext.pb.go
@@ -49,6 +49,8 @@ const (
 	ExtensionType_ET_GCS_BUCKET ExtensionType = 18
 	// IAM related.
 	ExtensionType_ET_IAM_SERVICE_ACCOUNT ExtensionType = 19
+	// GKE related.
+	ExtensionType_ET_GKE_CLUSTER ExtensionType = 20
 )
 
 // Enum value maps for ExtensionType.
@@ -74,6 +76,7 @@ var (
 		17: "ET_GCE_GENERIC_RESOURCE",
 		18: "ET_GCS_BUCKET",
 		19: "ET_IAM_SERVICE_ACCOUNT",
+		20: "ET_GKE_CLUSTER",
 	}
 	ExtensionType_value = map[string]int32{
 		"ET_UNDEFINED":            0,
@@ -96,6 +99,7 @@ var (
 		"ET_GCE_GENERIC_RESOURCE": 17,
 		"ET_GCS_BUCKET":           18,
 		"ET_IAM_SERVICE_ACCOUNT":  19,
+		"ET_GKE_CLUSTER":          20,
 	}
 )
 
@@ -1353,7 +1357,7 @@ var file_bpmetadata_ui_ext_proto_rawDesc = []byte{
 	0x6c, 0x65, 0x22, 0x32, 0x0a, 0x1a, 0x49, 0x41, 0x4d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
 	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
 	0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x2a, 0xd5, 0x03, 0x0a, 0x0d, 0x45, 0x78, 0x74, 0x65, 0x6e,
+	0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x2a, 0xe9, 0x03, 0x0a, 0x0d, 0x45, 0x78, 0x74, 0x65, 0x6e,
 	0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x0c, 0x45, 0x54, 0x5f, 0x55,
 	0x4e, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x45, 0x54,
 	0x5f, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x5f, 0x41, 0x44, 0x44, 0x52, 0x45, 0x53, 0x53, 0x10, 0x01,
@@ -1382,18 +1386,19 @@ var file_bpmetadata_ui_ext_proto_rawDesc = []byte{
 	0x45, 0x52, 0x49, 0x43, 0x5f, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x11, 0x12,
 	0x11, 0x0a, 0x0d, 0x45, 0x54, 0x5f, 0x47, 0x43, 0x53, 0x5f, 0x42, 0x55, 0x43, 0x4b, 0x45, 0x54,
 	0x10, 0x12, 0x12, 0x1a, 0x0a, 0x16, 0x45, 0x54, 0x5f, 0x49, 0x41, 0x4d, 0x5f, 0x53, 0x45, 0x52,
-	0x56, 0x49, 0x43, 0x45, 0x5f, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x10, 0x13, 0x2a, 0x52,
-	0x0a, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x50, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x12, 0x0a, 0x0e, 0x49, 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x49, 0x50, 0x5f, 0x45, 0x50, 0x48, 0x45, 0x4d,
-	0x45, 0x52, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x50, 0x5f, 0x53, 0x54, 0x41,
-	0x54, 0x49, 0x43, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x50, 0x5f, 0x4e, 0x4f, 0x4e, 0x45,
-	0x10, 0x03, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x50, 0x6c, 0x61, 0x74,
-	0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2d, 0x66, 0x6f, 0x75, 0x6e, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x6c,
-	0x69, 0x2f, 0x62, 0x70, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x56, 0x49, 0x43, 0x45, 0x5f, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x10, 0x13, 0x12, 0x12,
+	0x0a, 0x0e, 0x45, 0x54, 0x5f, 0x47, 0x4b, 0x45, 0x5f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52,
+	0x10, 0x14, 0x2a, 0x52, 0x0a, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x50,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x49, 0x50, 0x5f, 0x45,
+	0x50, 0x48, 0x45, 0x4d, 0x45, 0x52, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x50,
+	0x5f, 0x53, 0x54, 0x41, 0x54, 0x49, 0x43, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x50, 0x5f,
+	0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x03, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64,
+	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2d, 0x66,
+	0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x6b, 0x69,
+	0x74, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x62, 0x70, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/cli/bpmetadata/proto/bpmetadata_ui_ext.proto b/cli/bpmetadata/proto/bpmetadata_ui_ext.proto
index 3422572db7c..f3c0644e623 100644
--- a/cli/bpmetadata/proto/bpmetadata_ui_ext.proto
+++ b/cli/bpmetadata/proto/bpmetadata_ui_ext.proto
@@ -36,6 +36,9 @@ enum ExtensionType {
 
   // IAM related.
   ET_IAM_SERVICE_ACCOUNT = 19;
+
+  // GKE related.
+  ET_GKE_CLUSTER = 20;
 }
 
 // An extension for variables defined as part of DisplayVariable. The