From 50ee46f4a2232806071640ce11f9e193061b1499 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 13 Aug 2025 13:09:49 -0700
Subject: [PATCH 01/17] Add MaxEcku to create update and describe

---
 internal/kafka/command_cluster_create.go   | 28 ++++++++++++
 internal/kafka/command_cluster_describe.go |  4 ++
 internal/kafka/command_cluster_update.go   | 51 +++++++++++++++++++++-
 internal/kafka/utils.go                    | 13 ++++++
 4 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/internal/kafka/command_cluster_create.go b/internal/kafka/command_cluster_create.go
index 83d5bd812f..98a71922b4 100644
--- a/internal/kafka/command_cluster_create.go
+++ b/internal/kafka/command_cluster_create.go
@@ -63,6 +63,8 @@ func (c *clusterCommand) newCreateCommand() *cobra.Command {
 	pcmd.AddAvailabilityFlag(cmd)
 	pcmd.AddTypeFlag(cmd)
 	cmd.Flags().Int("cku", 0, `Number of Confluent Kafka Units (non-negative). Required for Kafka clusters of type "dedicated".`)
+	cmd.Flags().Int("max-ecku", 0, `Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. `+
+		`Kafka clusters with "HIGH" availability must have at least two eCKUs.`)
 	pcmd.AddByokKeyFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddNetworkFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
@@ -135,6 +137,32 @@ func (c *clusterCommand) create(cmd *cobra.Command, args []string) error {
 		Byok:         keyGlobalObjectReference,
 	}}
 
+	if cmd.Flags().Changed("max-ecku") {
+		maxEcku, err := cmd.Flags().GetInt("max-ecku")
+		if err != nil {
+			return err
+		}
+		if clusterType == skuDedicated {
+			return errors.NewErrorWithSuggestions("the `--max-ecku` flag can only be used when creating a Basic, Standard, Enterprise, or Freight Kafka cluster", "Specify a different cluster with `--type` flag.")
+		}
+		if maxEcku < 1 {
+			return fmt.Errorf("`--max-ecku` value must be at least 1")
+		}
+		//if availability == "MULTI_ZONE" && maxEcku < 2 {
+		//	return fmt.Errorf("`--max-ecku` value must be at least 2 for high availability")
+		//}
+
+		if clusterType == skuBasic {
+			createCluster.Spec.Config.CmkV2Basic.MaxEcku = cmkv2.PtrInt32(int32(maxEcku))
+		} else if clusterType == skuStandard {
+			createCluster.Spec.Config.CmkV2Standard.MaxEcku = cmkv2.PtrInt32(int32(maxEcku))
+		} else if clusterType == skuEnterprise {
+			createCluster.Spec.Config.CmkV2Enterprise.MaxEcku = cmkv2.PtrInt32(int32(maxEcku))
+		} else if clusterType == skuFreight {
+			createCluster.Spec.Config.CmkV2Freight.MaxEcku = cmkv2.PtrInt32(int32(maxEcku))
+		}
+	}
+
 	if cmd.Flags().Changed("cku") {
 		cku, err := cmd.Flags().GetInt("cku")
 		if err != nil {
diff --git a/internal/kafka/command_cluster_describe.go b/internal/kafka/command_cluster_describe.go
index 723f0683c6..ef1ac54af2 100644
--- a/internal/kafka/command_cluster_describe.go
+++ b/internal/kafka/command_cluster_describe.go
@@ -38,6 +38,7 @@ type describeStruct struct {
 	ByokKeyId          string `human:"BYOK Key ID" serialized:"byok_key_id"`
 	EncryptionKeyId    string `human:"Encryption Key ID" serialized:"encryption_key_id"`
 	RestEndpoint       string `human:"REST Endpoint" serialized:"rest_endpoint"`
+	MaxEcku            *int32 `human:"Max eCKU,omitempty" serialized:"max_ecku,omitempty"`
 	TopicCount         int    `human:"Topic Count,omitempty" serialized:"topic_count,omitempty"`
 }
 
@@ -147,6 +148,7 @@ func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, ctx *config.Con
 		ByokKeyId:          getCmkByokId(cluster),
 		EncryptionKeyId:    getCmkEncryptionKey(cluster),
 		RestEndpoint:       cluster.Spec.GetHttpEndpoint(),
+		MaxEcku:            getCmkMaxEcku(cluster), // omited to output if cluster is of type  dedicated
 	}
 }
 
@@ -171,6 +173,8 @@ func getKafkaClusterDescribeFields(cluster *cmkv2.CmkV2Cluster, basicFields []st
 		if cluster.Spec.Byok != nil {
 			describeFields = append(describeFields, "ByokId")
 		}
+	} else {
+		describeFields = append(describeFields, "Max eCKU") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
 	}
 
 	if getTopicCount {
diff --git a/internal/kafka/command_cluster_update.go b/internal/kafka/command_cluster_update.go
index 398f95f022..854f63c377 100644
--- a/internal/kafka/command_cluster_update.go
+++ b/internal/kafka/command_cluster_update.go
@@ -38,12 +38,14 @@ func (c *clusterCommand) newUpdateCommand() *cobra.Command {
 	cmd.Flags().String("name", "", "Name of the Kafka cluster.")
 	cmd.Flags().Uint32("cku", 0, `Number of Confluent Kafka Units. For Kafka clusters of type "dedicated" only. When shrinking a cluster, you must reduce capacity one CKU at a time.`)
 	cmd.Flags().String("type", "", `Type of the Kafka cluster. Only supports upgrading from "Basic" to "Standard".`)
+	cmd.Flags().Int("max-ecku", 0, `Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. `+
+		`Kafka clusters with "HIGH" availability must have at least two eCKUs.`)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 	pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddEndpointFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddOutputFlag(cmd)
 
-	cmd.MarkFlagsOneRequired("name", "cku", "type")
+	cmd.MarkFlagsOneRequired("name", "cku", "type", "max-ecku")
 
 	return cmd
 }
@@ -91,6 +93,53 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 		update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{CmkV2Dedicated: &cmkv2.CmkV2Dedicated{Kind: "Dedicated", Cku: updatedCku}}
 	}
 
+	if cmd.Flags().Changed("max-ecku") {
+		maxEcku, err := cmd.Flags().GetInt("max-ecku")
+		if err != nil {
+			return err
+		}
+		currentConfig := currentCluster.GetSpec().Config
+		if currentConfig.CmkV2Dedicated != nil {
+			return errors.NewErrorWithSuggestions("the `--max-ecku` flag can only be used when creating a Basic, Standard, Enterprise, or Freight Kafka cluster", "Specify a different cluster with `--type` flag.")
+		}
+		if maxEcku < 1 {
+			return fmt.Errorf("`--max-ecku` value must be at least 1")
+		}
+		//if availability == "MULTI_ZONE" && maxEcku < 2 {
+		//	return fmt.Errorf("`--max-ecku` value must be at least 2 for high availability")
+		//}
+
+		if currentConfig.CmkV2Basic != nil {
+			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+				CmkV2Basic: &cmkv2.CmkV2Basic{
+					Kind:    "Basic",
+					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
+				},
+			}
+		} else if currentConfig.CmkV2Standard != nil {
+			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+				CmkV2Standard: &cmkv2.CmkV2Standard{
+					Kind:    "Standard",
+					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
+				},
+			}
+		} else if currentConfig.CmkV2Enterprise != nil {
+			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+				CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
+					Kind:    "Enterprise",
+					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
+				},
+			}
+		} else if currentConfig.CmkV2Freight != nil {
+			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+				CmkV2Freight: &cmkv2.CmkV2Freight{
+					Kind:    "Freight",
+					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
+				},
+			}
+		}
+	}
+
 	if cmd.Flags().Changed("type") {
 		newType, err := cmd.Flags().GetString("type")
 		if err != nil {
diff --git a/internal/kafka/utils.go b/internal/kafka/utils.go
index 26026d1959..1c87e400c7 100644
--- a/internal/kafka/utils.go
+++ b/internal/kafka/utils.go
@@ -120,6 +120,19 @@ func getCmkClusterPendingSize(cluster *cmkv2.CmkV2Cluster) int32 {
 	return -1
 }
 
+func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) *int32 {
+	if isBasic(cluster) {
+		return cluster.Spec.Config.CmkV2Basic.MaxEcku
+	} else if isStandard(cluster) {
+		return cluster.Spec.Config.CmkV2Standard.MaxEcku
+	} else if isEnterprise(cluster) {
+		return cluster.Spec.Config.CmkV2Enterprise.MaxEcku
+	} else if isFreight(cluster) {
+		return cluster.Spec.Config.CmkV2Freight.MaxEcku
+	}
+	return nil
+}
+
 func getCmkByokId(cluster *cmkv2.CmkV2Cluster) string {
 	if isDedicated(cluster) && cluster.Spec.Byok != nil {
 		return cluster.Spec.Byok.Id

From 690a4f5c6c9fdaf71533f9c23a3e2aa7fb950ae7 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 13 Aug 2025 18:10:10 -0700
Subject: [PATCH 02/17] Add tests

---
 internal/kafka/command_cluster_describe.go    | 12 ++--
 internal/kafka/command_cluster_update.go      |  4 ++
 test/fixtures/output/kafka/1.golden           |  1 +
 .../create-dedicated-max-ecku-error.golden    |  4 ++
 .../kafka/cluster/create-flag-error.golden    |  7 +-
 .../create-freight-max-ecku-error.golden      |  1 +
 .../cluster/create-freight-max-ecku.golden    | 17 +++++
 .../cluster/update-max-ecku-error.golden      |  1 +
 .../kafka/cluster/update-max-ecku.golden      | 17 +++++
 .../cluster/update-type-empty-error.golden    |  5 ++
 test/kafka_test.go                            |  5 ++
 test/test-server/cmk_handlers.go              | 66 ++++++++++++++++++-
 12 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/output/kafka/cluster/create-dedicated-max-ecku-error.golden
 create mode 100644 test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
 create mode 100644 test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-max-ecku-error.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-max-ecku.golden

diff --git a/internal/kafka/command_cluster_describe.go b/internal/kafka/command_cluster_describe.go
index ef1ac54af2..87b4e9c352 100644
--- a/internal/kafka/command_cluster_describe.go
+++ b/internal/kafka/command_cluster_describe.go
@@ -37,8 +37,8 @@ type describeStruct struct {
 	Endpoint           string `human:"Endpoint" serialized:"endpoint"`
 	ByokKeyId          string `human:"BYOK Key ID" serialized:"byok_key_id"`
 	EncryptionKeyId    string `human:"Encryption Key ID" serialized:"encryption_key_id"`
-	RestEndpoint       string `human:"REST Endpoint" serialized:"rest_endpoint"`
-	MaxEcku            *int32 `human:"Max eCKU,omitempty" serialized:"max_ecku,omitempty"`
+    RestEndpoint       string `human:"REST Endpoint" serialized:"rest_endpoint"`
+    MaxEcku            int32  `human:"Max eCKU,omitempty" serialized:"max_ecku,omitempty"`
 	TopicCount         int    `human:"Topic Count,omitempty" serialized:"topic_count,omitempty"`
 }
 
@@ -128,6 +128,10 @@ func (c *clusterCommand) outputKafkaClusterDescription(cmd *cobra.Command, clust
 func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, ctx *config.Context) *describeStruct {
 	clusterStorage := getKafkaClusterStorage(cluster)
 	ingress, egress := getCmkClusterIngressAndEgressMbps(cluster)
+    var maxEckuVal int32
+    if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
+        maxEckuVal = *maxEckuPtr
+    }
 
 	return &describeStruct{
 		IsCurrent:          cluster.GetId() == ctx.KafkaClusterContext.GetActiveKafkaClusterId(),
@@ -148,7 +152,7 @@ func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, ctx *config.Con
 		ByokKeyId:          getCmkByokId(cluster),
 		EncryptionKeyId:    getCmkEncryptionKey(cluster),
 		RestEndpoint:       cluster.Spec.GetHttpEndpoint(),
-		MaxEcku:            getCmkMaxEcku(cluster), // omited to output if cluster is of type  dedicated
+		MaxEcku:            maxEckuVal, // omitted by omitempty when zero or when field is filtered out
 	}
 }
 
@@ -174,7 +178,7 @@ func getKafkaClusterDescribeFields(cluster *cmkv2.CmkV2Cluster, basicFields []st
 			describeFields = append(describeFields, "ByokId")
 		}
 	} else {
-		describeFields = append(describeFields, "Max eCKU") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
+        describeFields = append(describeFields, "MaxEcku") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
 	}
 
 	if getTopicCount {
diff --git a/internal/kafka/command_cluster_update.go b/internal/kafka/command_cluster_update.go
index 854f63c377..4941c4ce9e 100644
--- a/internal/kafka/command_cluster_update.go
+++ b/internal/kafka/command_cluster_update.go
@@ -32,6 +32,10 @@ func (c *clusterCommand) newUpdateCommand() *cobra.Command {
 				Text: `Update the type of a Kafka cluster from "Basic" to "Standard":`,
 				Code: `confluent kafka cluster update lkc-123456 --type "standard"`,
 			},
+			examples.Example{
+				Text: `Update the Max eCKU count of a Kafka cluster:`,
+				Code: `confluent kafka cluster update lkc-123456 --max-ecku 5`,
+			},
 		),
 	}
 
diff --git a/test/fixtures/output/kafka/1.golden b/test/fixtures/output/kafka/1.golden
index 7510b9f245..fa1f225136 100644
--- a/test/fixtures/output/kafka/1.golden
+++ b/test/fixtures/output/kafka/1.golden
@@ -23,6 +23,7 @@ Flags:
       --availability string   Specify the availability of the cluster as "single-zone", "multi-zone", "low", or "high". (default "single-zone")
       --type string           Specify the type of the Kafka cluster as "basic", "standard", "enterprise", "freight", or "dedicated". (default "basic")
       --cku int               Number of Confluent Kafka Units (non-negative). Required for Kafka clusters of type "dedicated".
+      --max-ecku int          Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
       --byok string           Confluent Cloud Key ID of a registered encryption key (use "confluent byok create" to register a key).
       --network string        Network ID.
       --context string        CLI context name.
diff --git a/test/fixtures/output/kafka/cluster/create-dedicated-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/create-dedicated-max-ecku-error.golden
new file mode 100644
index 0000000000..a81e8ae645
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/create-dedicated-max-ecku-error.golden
@@ -0,0 +1,4 @@
+Error: the `--max-ecku` flag can only be used when creating a Basic, Standard, Enterprise, or Freight Kafka cluster
+
+Suggestions:
+    Specify a different cluster with `--type` flag.
diff --git a/test/fixtures/output/kafka/cluster/create-flag-error.golden b/test/fixtures/output/kafka/cluster/create-flag-error.golden
index aaa80c3775..aa23c33f72 100644
--- a/test/fixtures/output/kafka/cluster/create-flag-error.golden
+++ b/test/fixtures/output/kafka/cluster/create-flag-error.golden
@@ -1,4 +1,4 @@
-Error: at least one of the flags in the group [name cku type] is required
+Error: at least one of the flags in the group [name cku type max-ecku] is required
 Usage:
   confluent kafka cluster update <id> [flags]
 
@@ -11,10 +11,15 @@ Update the type of a Kafka cluster from "Basic" to "Standard":
 
   $ confluent kafka cluster update lkc-123456 --type "standard"
 
+Update the Max eCKU count of a Kafka cluster:
+
+  $ confluent kafka cluster update lkc-123456 --max-ecku 5
+
 Flags:
       --name string             Name of the Kafka cluster.
       --cku uint32              Number of Confluent Kafka Units. For Kafka clusters of type "dedicated" only. When shrinking a cluster, you must reduce capacity one CKU at a time.
       --type string             Type of the Kafka cluster. Only supports upgrading from "Basic" to "Standard".
+      --max-ecku int            Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
       --context string          CLI context name.
       --environment string      Environment ID.
       --kafka-endpoint string   Endpoint to be used for this Kafka cluster.
diff --git a/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
new file mode 100644
index 0000000000..88f2f76c1a
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
@@ -0,0 +1 @@
+Error: `--max-ecku` value must be at least 1
diff --git a/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden b/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
new file mode 100644
index 0000000000..0904c5cc50
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
@@ -0,0 +1,17 @@
+It may take up to 5 minutes for the Kafka cluster to be ready.
++----------------------+---------------------------+
+| Current              | false                     |
+| ID                   | lkc-def963                |
+| Name                 | my-new-cluster            |
+| Type                 | FREIGHT                   |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | Infinite                  |
+| Cloud                | aws                       |
+| Region               | us-east-1                 |
+| Availability         | low                       |
+| Status               | PROVISIONING              |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | https://pkc-endpoint      |
+| Max eCKU             | 3                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden
new file mode 100644
index 0000000000..88f2f76c1a
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden
@@ -0,0 +1 @@
+Error: `--max-ecku` value must be at least 1
diff --git a/test/fixtures/output/kafka/cluster/update-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-max-ecku.golden
new file mode 100644
index 0000000000..feee8c0da9
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-max-ecku.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update                |
+| Name                 |                           |
+| Type                 | BASIC                     |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | 5 TB                      |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | single-zone               |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 4                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-type-empty-error.golden b/test/fixtures/output/kafka/cluster/update-type-empty-error.golden
index 814a92f061..ac44cb2c0c 100644
--- a/test/fixtures/output/kafka/cluster/update-type-empty-error.golden
+++ b/test/fixtures/output/kafka/cluster/update-type-empty-error.golden
@@ -11,10 +11,15 @@ Update the type of a Kafka cluster from "Basic" to "Standard":
 
   $ confluent kafka cluster update lkc-123456 --type "standard"
 
+Update the Max eCKU count of a Kafka cluster:
+
+  $ confluent kafka cluster update lkc-123456 --max-ecku 5
+
 Flags:
       --name string             Name of the Kafka cluster.
       --cku uint32              Number of Confluent Kafka Units. For Kafka clusters of type "dedicated" only. When shrinking a cluster, you must reduce capacity one CKU at a time.
       --type string             Type of the Kafka cluster. Only supports upgrading from "Basic" to "Standard".
+      --max-ecku int            Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
       --context string          CLI context name.
       --environment string      Environment ID.
       --kafka-endpoint string   Endpoint to be used for this Kafka cluster.
diff --git a/test/kafka_test.go b/test/kafka_test.go
index 11c3169016..0415bf15a8 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -26,6 +26,7 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster create my-failed-cluster --cloud aws --region us-east-1 --availability single-zone --type oops", fixture: "kafka/cluster/create-type-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-failed-cluster --cloud aws --region us-east-1 --availability single-zone --type dedicated --cku 0", fixture: "kafka/cluster/create-cku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-dedicated-cluster --cloud aws --region us-east-1 --type dedicated --cku 1", fixture: "kafka/22.golden"},
+		{args: "kafka cluster create my-dedicated-cluster --cloud aws --region us-east-1 --type dedicated --max-ecku 5", fixture: "kafka/cluster/create-dedicated-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o json", fixture: "kafka/23.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o yaml", fixture: "kafka/24.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability oops-zone", fixture: "kafka/cluster/create-availability-zone-error.golden", exitCode: 1},
@@ -33,6 +34,8 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise", fixture: "kafka/cluster/create-enterprise-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --availability multi-zone", fixture: "kafka/cluster/create-freight.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight", fixture: "kafka/cluster/create-freight-low.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --max-ecku 3", fixture: "kafka/cluster/create-freight-max-ecku.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --max-ecku 0", fixture: "kafka/cluster/create-freight-max-ecku-error.golden", exitCode: 1},
 
 		{args: "kafka cluster update lkc-update", fixture: "kafka/cluster/create-flag-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --name lkc-update-name", fixture: "kafka/26.golden"},
@@ -45,6 +48,8 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update-dedicated-shrink --cku 1", fixture: "kafka/45.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-shrink-multi --cku 1", fixture: "kafka/cluster/update-dedicated-shrink-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --cku 1", fixture: "kafka/cluster/update-resize-error.golden", exitCode: 1},
+		{args: "kafka cluster update lkc-update --max-ecku 4", fixture: "kafka/cluster/update-max-ecku.golden"}, // output does not include Max eCKU value
+		{args: "kafka cluster update lkc-update --max-ecku 0", fixture: "kafka/cluster/update-max-ecku-error.golden", exitCode: 1},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},
 		{args: "kafka cluster update lkc-update --type Standard", fixture: "kafka/cluster/update-type-success.golden"},
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 19c6b17bac..cfd7772b51 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -56,6 +56,9 @@ func handleCmkKafkaClusterCreate(t *testing.T) http.HandlerFunc {
 				return
 			}
 			cluster.Spec.Config.CmkV2Enterprise = &cmkv2.CmkV2Enterprise{Kind: "Enterprise"}
+			if req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+				cluster.Spec.Config.CmkV2Enterprise.MaxEcku = req.Spec.Config.CmkV2Enterprise.MaxEcku
+			}
 		} else if req.Spec.Config.CmkV2Freight != nil {
 			if req.Spec.GetAvailability() == "SINGLE_ZONE" {
 				err := writeError(w, "Durability must be HIGH for an Freight cluster")
@@ -63,8 +66,18 @@ func handleCmkKafkaClusterCreate(t *testing.T) http.HandlerFunc {
 				return
 			}
 			cluster.Spec.Config.CmkV2Freight = &cmkv2.CmkV2Freight{Kind: "Freight"}
-		} else {
+			if req.Spec.Config.CmkV2Freight.MaxEcku != nil {
+				cluster.Spec.Config.CmkV2Freight.MaxEcku = req.Spec.Config.CmkV2Freight.MaxEcku
+			}
+		} else if req.Spec.Config.CmkV2Basic != nil {
 			cluster.Spec.Config.CmkV2Basic = &cmkv2.CmkV2Basic{Kind: "Basic"}
+			if req.Spec.Config.CmkV2Basic.MaxEcku != nil {
+				cluster.Spec.Config.CmkV2Basic.MaxEcku = req.Spec.Config.CmkV2Basic.MaxEcku
+			}
+		} else {
+			if req.Spec.Config.CmkV2Standard.MaxEcku != nil {
+				cluster.Spec.Config.CmkV2Standard.MaxEcku = req.Spec.Config.CmkV2Standard.MaxEcku
+			}
 		}
 
 		if req.Spec.GetCloud() == "oops" {
@@ -272,6 +285,57 @@ func handleCmkKafkaClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 				return
 			}
 
+
+			// Handle Max eCKU update across all eligible SKUs
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Basic != nil && req.Spec.Config.CmkV2Basic.MaxEcku != nil {
+				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Basic: &cmkv2.CmkV2Basic{
+						Kind:    "Basic",
+						MaxEcku: req.Spec.Config.CmkV2Basic.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+				require.NoError(t, err)
+				return
+			}
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Standard != nil && req.Spec.Config.CmkV2Standard.MaxEcku != nil {
+				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Standard: &cmkv2.CmkV2Standard{
+						Kind:    "Standard",
+						MaxEcku: req.Spec.Config.CmkV2Standard.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+				require.NoError(t, err)
+				return
+			}
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Enterprise != nil && req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
+						Kind:    "Enterprise",
+						MaxEcku: req.Spec.Config.CmkV2Enterprise.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+				require.NoError(t, err)
+				return
+			}
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Freight != nil && req.Spec.Config.CmkV2Freight.MaxEcku != nil {
+				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Freight: &cmkv2.CmkV2Freight{
+						Kind:    "Freight",
+						MaxEcku: req.Spec.Config.CmkV2Freight.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+				require.NoError(t, err)
+				return
+			}
+
 			// Handle other update cases
 			if req.Spec.Config == nil || req.Spec.Config.CmkV2Dedicated.Cku == 0 {
 				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())

From 472e1aee5ab13ed70d93da353064e82629f28e1c Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 13 Aug 2025 21:51:29 -0700
Subject: [PATCH 03/17] Update help test and fix linter

---
 cmd/lint/main.go                              |  1 +
 internal/kafka/command_cluster_describe.go    | 14 +++----
 .../output/kafka/cluster/create-help.golden   |  1 +
 .../output/kafka/cluster/update-help.golden   |  5 +++
 test/test-server/cmk_handlers.go              | 38 -------------------
 5 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/cmd/lint/main.go b/cmd/lint/main.go
index 3c6f474f52..4ba7de4ee2 100644
--- a/cmd/lint/main.go
+++ b/cmd/lint/main.go
@@ -234,6 +234,7 @@ var vocabWords = []string{
 	"deserializer",
 	"deserializers",
 	"dns",
+	"ecku",
 	"elastic",
 	"env",
 	"eu",
diff --git a/internal/kafka/command_cluster_describe.go b/internal/kafka/command_cluster_describe.go
index 87b4e9c352..6b5b70a9f5 100644
--- a/internal/kafka/command_cluster_describe.go
+++ b/internal/kafka/command_cluster_describe.go
@@ -37,8 +37,8 @@ type describeStruct struct {
 	Endpoint           string `human:"Endpoint" serialized:"endpoint"`
 	ByokKeyId          string `human:"BYOK Key ID" serialized:"byok_key_id"`
 	EncryptionKeyId    string `human:"Encryption Key ID" serialized:"encryption_key_id"`
-    RestEndpoint       string `human:"REST Endpoint" serialized:"rest_endpoint"`
-    MaxEcku            int32  `human:"Max eCKU,omitempty" serialized:"max_ecku,omitempty"`
+	RestEndpoint       string `human:"REST Endpoint" serialized:"rest_endpoint"`
+	MaxEcku            int32  `human:"Max eCKU,omitempty" serialized:"max_ecku,omitempty"`
 	TopicCount         int    `human:"Topic Count,omitempty" serialized:"topic_count,omitempty"`
 }
 
@@ -128,10 +128,10 @@ func (c *clusterCommand) outputKafkaClusterDescription(cmd *cobra.Command, clust
 func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, ctx *config.Context) *describeStruct {
 	clusterStorage := getKafkaClusterStorage(cluster)
 	ingress, egress := getCmkClusterIngressAndEgressMbps(cluster)
-    var maxEckuVal int32
-    if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
-        maxEckuVal = *maxEckuPtr
-    }
+	var maxEckuVal int32
+	if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
+		maxEckuVal = *maxEckuPtr
+	}
 
 	return &describeStruct{
 		IsCurrent:          cluster.GetId() == ctx.KafkaClusterContext.GetActiveKafkaClusterId(),
@@ -178,7 +178,7 @@ func getKafkaClusterDescribeFields(cluster *cmkv2.CmkV2Cluster, basicFields []st
 			describeFields = append(describeFields, "ByokId")
 		}
 	} else {
-        describeFields = append(describeFields, "MaxEcku") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
+		describeFields = append(describeFields, "MaxEcku") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
 	}
 
 	if getTopicCount {
diff --git a/test/fixtures/output/kafka/cluster/create-help.golden b/test/fixtures/output/kafka/cluster/create-help.golden
index 0bd8d6a27b..f5c8203cfd 100644
--- a/test/fixtures/output/kafka/cluster/create-help.golden
+++ b/test/fixtures/output/kafka/cluster/create-help.golden
@@ -26,6 +26,7 @@ Flags:
       --availability string   Specify the availability of the cluster as "single-zone", "multi-zone", "low", or "high". (default "single-zone")
       --type string           Specify the type of the Kafka cluster as "basic", "standard", "enterprise", "freight", or "dedicated". (default "basic")
       --cku int               Number of Confluent Kafka Units (non-negative). Required for Kafka clusters of type "dedicated".
+      --max-ecku int          Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
       --byok string           Confluent Cloud Key ID of a registered encryption key (use "confluent byok create" to register a key).
       --network string        Network ID.
       --context string        CLI context name.
diff --git a/test/fixtures/output/kafka/cluster/update-help.golden b/test/fixtures/output/kafka/cluster/update-help.golden
index a7b8784f6e..e3ae69c2e2 100644
--- a/test/fixtures/output/kafka/cluster/update-help.golden
+++ b/test/fixtures/output/kafka/cluster/update-help.golden
@@ -12,10 +12,15 @@ Update the type of a Kafka cluster from "Basic" to "Standard":
 
   $ confluent kafka cluster update lkc-123456 --type "standard"
 
+Update the Max eCKU count of a Kafka cluster:
+
+  $ confluent kafka cluster update lkc-123456 --max-ecku 5
+
 Flags:
       --name string             Name of the Kafka cluster.
       --cku uint32              Number of Confluent Kafka Units. For Kafka clusters of type "dedicated" only. When shrinking a cluster, you must reduce capacity one CKU at a time.
       --type string             Type of the Kafka cluster. Only supports upgrading from "Basic" to "Standard".
+      --max-ecku int            Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
       --context string          CLI context name.
       --environment string      Environment ID.
       --kafka-endpoint string   Endpoint to be used for this Kafka cluster.
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index cfd7772b51..4fe75c41ca 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -285,8 +285,6 @@ func handleCmkKafkaClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 				return
 			}
 
-
-			// Handle Max eCKU update across all eligible SKUs
 			if req.Spec.Config != nil && req.Spec.Config.CmkV2Basic != nil && req.Spec.Config.CmkV2Basic.MaxEcku != nil {
 				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
 				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
@@ -299,42 +297,6 @@ func handleCmkKafkaClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 				require.NoError(t, err)
 				return
 			}
-			if req.Spec.Config != nil && req.Spec.Config.CmkV2Standard != nil && req.Spec.Config.CmkV2Standard.MaxEcku != nil {
-				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
-				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
-					CmkV2Standard: &cmkv2.CmkV2Standard{
-						Kind:    "Standard",
-						MaxEcku: req.Spec.Config.CmkV2Standard.MaxEcku,
-					},
-				}
-				err := json.NewEncoder(w).Encode(cluster)
-				require.NoError(t, err)
-				return
-			}
-			if req.Spec.Config != nil && req.Spec.Config.CmkV2Enterprise != nil && req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
-				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
-				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
-					CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
-						Kind:    "Enterprise",
-						MaxEcku: req.Spec.Config.CmkV2Enterprise.MaxEcku,
-					},
-				}
-				err := json.NewEncoder(w).Encode(cluster)
-				require.NoError(t, err)
-				return
-			}
-			if req.Spec.Config != nil && req.Spec.Config.CmkV2Freight != nil && req.Spec.Config.CmkV2Freight.MaxEcku != nil {
-				cluster := getCmkBasicDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
-				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
-					CmkV2Freight: &cmkv2.CmkV2Freight{
-						Kind:    "Freight",
-						MaxEcku: req.Spec.Config.CmkV2Freight.MaxEcku,
-					},
-				}
-				err := json.NewEncoder(w).Encode(cluster)
-				require.NoError(t, err)
-				return
-			}
 
 			// Handle other update cases
 			if req.Spec.Config == nil || req.Spec.Config.CmkV2Dedicated.Cku == 0 {

From 1da350166bbedbcb13190258ce3b9bac9d97b02a Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Tue, 19 Aug 2025 17:41:16 -0700
Subject: [PATCH 04/17] Improve test coverage and nit fix

---
 internal/kafka/command_cluster_update.go      |  3 +-
 .../cluster/create-enterprise-max-ecku.golden | 17 ++++++++
 .../cluster/update-standard-max-ecku.golden   | 17 ++++++++
 .../output/kafka/create-basic-max-ecku.golden | 17 ++++++++
 .../update-dedicated-max-ecku-error.golden    |  4 ++
 test/kafka_test.go                            |  6 ++-
 test/test-server/cmk_handlers.go              | 34 +++++++++++++++
 test/test-server/utils.go                     | 42 +++++++++++++++++++
 8 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
 create mode 100644 test/fixtures/output/kafka/create-basic-max-ecku.golden
 create mode 100644 test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden

diff --git a/internal/kafka/command_cluster_update.go b/internal/kafka/command_cluster_update.go
index 4941c4ce9e..bb5dd63614 100644
--- a/internal/kafka/command_cluster_update.go
+++ b/internal/kafka/command_cluster_update.go
@@ -104,11 +104,12 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 		}
 		currentConfig := currentCluster.GetSpec().Config
 		if currentConfig.CmkV2Dedicated != nil {
-			return errors.NewErrorWithSuggestions("the `--max-ecku` flag can only be used when creating a Basic, Standard, Enterprise, or Freight Kafka cluster", "Specify a different cluster with `--type` flag.")
+			return errors.NewErrorWithSuggestions("the `--max-ecku` flag can only be used when creating or updating a Basic, Standard, Enterprise, or Freight Kafka cluster", "Specify another cluster or use the `--cku` flag instead.")
 		}
 		if maxEcku < 1 {
 			return fmt.Errorf("`--max-ecku` value must be at least 1")
 		}
+		// should be taken cared at API backend
 		//if availability == "MULTI_ZONE" && maxEcku < 2 {
 		//	return fmt.Errorf("`--max-ecku` value must be at least 2 for high availability")
 		//}
diff --git a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
new file mode 100644
index 0000000000..3baaa8a1d6
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
@@ -0,0 +1,17 @@
+It may take up to 5 minutes for the Kafka cluster to be ready.
++----------------------+---------------------------+
+| Current              | false                     |
+| ID                   | lkc-def963                |
+| Name                 | my-new-cluster            |
+| Type                 | ENTERPRISE                |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | Infinite                  |
+| Cloud                | aws                       |
+| Region               | us-east-1                 |
+| Availability         | multi-zone                |
+| Status               | PROVISIONING              |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | https://pkc-endpoint      |
+| Max eCKU             | 4                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
new file mode 100644
index 0000000000..de10205a60
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-standard       |
+| Name                 |                           |
+| Type                 | STANDARD                  |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | Infinite                  |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | single-zone               |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 2                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/create-basic-max-ecku.golden b/test/fixtures/output/kafka/create-basic-max-ecku.golden
new file mode 100644
index 0000000000..17eb419ce7
--- /dev/null
+++ b/test/fixtures/output/kafka/create-basic-max-ecku.golden
@@ -0,0 +1,17 @@
+It may take up to 5 minutes for the Kafka cluster to be ready.
++----------------------+---------------------------+
+| Current              | false                     |
+| ID                   | lkc-def963                |
+| Name                 | my-new-cluster            |
+| Type                 | BASIC                     |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | 5 TB                      |
+| Cloud                | aws                       |
+| Region               | us-east-1                 |
+| Availability         | single-zone               |
+| Status               | PROVISIONING              |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | https://pkc-endpoint      |
+| Max eCKU             | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden b/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden
new file mode 100644
index 0000000000..b436b4f71e
--- /dev/null
+++ b/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden
@@ -0,0 +1,4 @@
+Error: the `--max-ecku` flag can only be used when updating a Basic, Standard, Enterprise, or Freight Kafka cluster
+
+Suggestions:
+    Specify a different cluster with `--type` flag.
diff --git a/test/kafka_test.go b/test/kafka_test.go
index 0415bf15a8..65d12d6e64 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -29,8 +29,10 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster create my-dedicated-cluster --cloud aws --region us-east-1 --type dedicated --max-ecku 5", fixture: "kafka/cluster/create-dedicated-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o json", fixture: "kafka/23.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o yaml", fixture: "kafka/24.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone --max-ecku 2", fixture: "kafka/create-basic-max-ecku.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability oops-zone", fixture: "kafka/cluster/create-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone", fixture: "kafka/cluster/create-enterprise.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone --max-ecku 4", fixture: "kafka/cluster/create-enterprise-max-ecku.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise", fixture: "kafka/cluster/create-enterprise-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --availability multi-zone", fixture: "kafka/cluster/create-freight.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight", fixture: "kafka/cluster/create-freight-low.golden"},
@@ -43,13 +45,15 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update --name lkc-update-name -o yaml", fixture: "kafka/29.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-expand --name lkc-update-dedicated-name --cku 2", fixture: "kafka/27.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-expand --cku 2", fixture: "kafka/39.golden"},
+		{args: "kafka cluster update lkc-update-dedicated-expand --cku 2 --max-ecku 3", fixture: "kafka/update-dedicated-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --cku 2", fixture: "kafka/cluster/update-resize-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update-dedicated-shrink --name lkc-update-dedicated-name --cku 1", fixture: "kafka/44.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-shrink --cku 1", fixture: "kafka/45.golden"},
 		{args: "kafka cluster update lkc-update-dedicated-shrink-multi --cku 1", fixture: "kafka/cluster/update-dedicated-shrink-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --cku 1", fixture: "kafka/cluster/update-resize-error.golden", exitCode: 1},
-		{args: "kafka cluster update lkc-update --max-ecku 4", fixture: "kafka/cluster/update-max-ecku.golden"}, // output does not include Max eCKU value
+		{args: "kafka cluster update lkc-update --max-ecku 4", fixture: "kafka/cluster/update-max-ecku.golden"},
 		{args: "kafka cluster update lkc-update --max-ecku 0", fixture: "kafka/cluster/update-max-ecku-error.golden", exitCode: 1},
+		{args: "kafka cluster update lkc-update-standard --max-ecku 2", fixture: "kafka/cluster/update-standard-max-ecku.golden"},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},
 		{args: "kafka cluster update lkc-update --type Standard", fixture: "kafka/cluster/update-type-success.golden"},
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 4fe75c41ca..16fb30b303 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -159,6 +159,8 @@ func handleCmkCluster(t *testing.T) http.HandlerFunc {
 			handleCmkKafkaClusterDescribeInfinite(t)(w, r)
 		case "lkc-update":
 			handleCmkKafkaClusterUpdateRequest(t)(w, r)
+		case "lkc-update-standard":
+			handleCmkKafkaStandardClusterUpdateRequest(t)(w, r)
 		case "lkc-update-dedicated-expand":
 			handleCmkKafkaDedicatedClusterExpansion(t)(w, r)
 		case "lkc-update-dedicated-shrink":
@@ -308,6 +310,38 @@ func handleCmkKafkaClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 	}
 }
 
+// Handler for GET/PUT "/cmk/v2/clusters/lkc-update-standard"
+func handleCmkKafkaStandardClusterUpdateRequest(t *testing.T) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			cluster := getCmkStandardDescribeCluster("lkc-update-standard", "lkc-update-standard")
+			cluster.Status = &cmkv2.CmkV2ClusterStatus{Phase: "PROVISIONED"}
+			err := json.NewEncoder(w).Encode(cluster)
+			require.NoError(t, err)
+		case http.MethodPatch:
+			var req cmkv2.CmkV2Cluster
+			err := json.NewDecoder(r.Body).Decode(&req)
+			require.NoError(t, err)
+			req.Id = cmkv2.PtrString("lkc-update-standard")
+
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Standard != nil && req.Spec.Config.CmkV2Standard.MaxEcku != nil {
+				cluster := getCmkStandardDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Standard: &cmkv2.CmkV2Standard{
+						Kind:    "Standard",
+						MaxEcku: req.Spec.Config.CmkV2Standard.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+				require.NoError(t, err)
+				return
+			}
+
+		}
+	}
+}
+
 // Handler for GET/PUT "/cmk/v2/clusters/lkc-update-dedicated-expand"
 func handleCmkKafkaDedicatedClusterExpansion(t *testing.T) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
diff --git a/test/test-server/utils.go b/test/test-server/utils.go
index 49b84b5ba1..30b4ea5833 100644
--- a/test/test-server/utils.go
+++ b/test/test-server/utils.go
@@ -427,6 +427,48 @@ func getCmkDedicatedDescribeCluster(id, name string, cku int32) *cmkv2.CmkV2Clus
 	}
 }
 
+func getCmkStandardDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
+	return &cmkv2.CmkV2Cluster{
+		Spec: &cmkv2.CmkV2ClusterSpec{
+			DisplayName: cmkv2.PtrString(name),
+			Cloud:       cmkv2.PtrString("aws"),
+			Region:      cmkv2.PtrString("us-west-2"),
+			Config: &cmkv2.CmkV2ClusterSpecConfigOneOf{
+				CmkV2Standard: &cmkv2.CmkV2Standard{Kind: "Standard"},
+			},
+			KafkaBootstrapEndpoint: cmkv2.PtrString("SASL_SSL://kafka-endpoint"),
+			HttpEndpoint:           cmkv2.PtrString(TestKafkaRestProxyUrl.String()),
+			Availability:           cmkv2.PtrString("SINGLE_ZONE"),
+			Endpoints: &cmkv2.ModelMap{
+				"pni-abc123-standard": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pni-abc123-standard.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pni-abc123-standard.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PNI",
+				},
+				"privatelink-uvw456-standard": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-uvw456-standard.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-uvw456-standard.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"privatelink-xyz789-standard": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-xyz789-standard.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-xyz789-standard.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"public-0001-standard": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://public-0001-standard.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://public-0001-standard.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PUBLIC",
+				},
+			},
+		},
+		Id: cmkv2.PtrString(id),
+		Status: &cmkv2.CmkV2ClusterStatus{
+			Phase: "PROVISIONED",
+		},
+	}
+}
+
 func getCmkUnknownDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
 	return &cmkv2.CmkV2Cluster{
 		Spec: &cmkv2.CmkV2ClusterSpec{

From d911e52d7ad62440bb5de63a660d23b80bcc45f4 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Tue, 19 Aug 2025 17:47:03 -0700
Subject: [PATCH 05/17] Nit

---
 .../output/kafka/update-dedicated-max-ecku-error.golden       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden b/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden
index b436b4f71e..43c7df95c7 100644
--- a/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden
+++ b/test/fixtures/output/kafka/update-dedicated-max-ecku-error.golden
@@ -1,4 +1,4 @@
-Error: the `--max-ecku` flag can only be used when updating a Basic, Standard, Enterprise, or Freight Kafka cluster
+Error: the `--max-ecku` flag can only be used when creating or updating a Basic, Standard, Enterprise, or Freight Kafka cluster
 
 Suggestions:
-    Specify a different cluster with `--type` flag.
+    Specify another cluster or use the `--cku` flag instead.

From c53ceff660453e994a6ed4c0819adb1c001593f6 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Thu, 21 Aug 2025 13:33:56 -0700
Subject: [PATCH 06/17] Fix linter

---
 test/test-server/cmk_handlers.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 16fb30b303..2bf269d528 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -337,7 +337,6 @@ func handleCmkKafkaStandardClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 				require.NoError(t, err)
 				return
 			}
-
 		}
 	}
 }

From c406b5e1b328da030a617f60c233094eea8ebbf0 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Fri, 5 Sep 2025 18:07:23 -0700
Subject: [PATCH 07/17] Add test cases

---
 .../create-enterprise-max-ecku-error.golden   |  1 +
 .../kafka/create-basic-max-ecku-error.golden  | 37 +++++++++++++++++++
 test/kafka_test.go                            |  2 +
 3 files changed, 40 insertions(+)
 create mode 100644 test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
 create mode 100644 test/fixtures/output/kafka/create-basic-max-ecku-error.golden

diff --git a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
new file mode 100644
index 0000000000..88f2f76c1a
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
@@ -0,0 +1 @@
+Error: `--max-ecku` value must be at least 1
diff --git a/test/fixtures/output/kafka/create-basic-max-ecku-error.golden b/test/fixtures/output/kafka/create-basic-max-ecku-error.golden
new file mode 100644
index 0000000000..329d9e0b65
--- /dev/null
+++ b/test/fixtures/output/kafka/create-basic-max-ecku-error.golden
@@ -0,0 +1,37 @@
+Error: invalid argument "abc" for "--max-ecku" flag: strconv.ParseInt: parsing "abc": invalid syntax
+Usage:
+  confluent kafka cluster create <name> [flags]
+
+Examples:
+Create a new dedicated cluster that uses a customer-managed encryption key in GCP:
+
+  $ confluent kafka cluster create sales092020 --cloud gcp --region asia-southeast1 --type dedicated --cku 1 --byok cck-a123z
+
+Create a new dedicated cluster that uses a customer-managed encryption key in AWS:
+
+  $ confluent kafka cluster create my-cluster --cloud aws --region us-west-2 --type dedicated --cku 1 --byok cck-a123z
+
+Create a new Freight cluster that uses a customer-managed encryption key in AWS:
+
+  $ confluent kafka cluster create my-cluster --cloud aws --region us-west-2 --type freight --cku 1 --byok cck-a123z --availability high
+
+For more information, see https://docs.confluent.io/current/cloud/clusters/byok-encrypted-clusters.html.
+
+Flags:
+      --cloud string          Specify the cloud provider as "aws", "azure", or "gcp".
+      --region string         Cloud region for Kafka (use "confluent kafka region list" to see all).
+      --availability string   Specify the availability of the cluster as "single-zone", "multi-zone", "low", or "high". (default "single-zone")
+      --type string           Specify the type of the Kafka cluster as "basic", "standard", "enterprise", "freight", or "dedicated". (default "basic")
+      --cku int               Number of Confluent Kafka Units (non-negative). Required for Kafka clusters of type "dedicated".
+      --max-ecku int          Maximum number of Elastic Confluent Kafka Units (eCKUs) that Kafka clusters should auto-scale to. Kafka clusters with "HIGH" availability must have at least two eCKUs.
+      --byok string           Confluent Cloud Key ID of a registered encryption key (use "confluent byok create" to register a key).
+      --network string        Network ID.
+      --context string        CLI context name.
+      --environment string    Environment ID.
+  -o, --output string         Specify the output format as "human", "json", or "yaml". (default "human")
+
+Global Flags:
+  -h, --help            Show help for this command.
+      --unsafe-trace    Equivalent to -vvvv, but also log HTTP requests and responses which might contain plaintext secrets.
+  -v, --verbose count   Increase verbosity (-v for warn, -vv for info, -vvv for debug, -vvvv for trace).
+
diff --git a/test/kafka_test.go b/test/kafka_test.go
index 65d12d6e64..b03fdfb900 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -30,9 +30,11 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o json", fixture: "kafka/23.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone -o yaml", fixture: "kafka/24.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone --max-ecku 2", fixture: "kafka/create-basic-max-ecku.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability single-zone --max-ecku abc", fixture: "kafka/create-basic-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability oops-zone", fixture: "kafka/cluster/create-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone", fixture: "kafka/cluster/create-enterprise.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone --max-ecku 4", fixture: "kafka/cluster/create-enterprise-max-ecku.golden"},
+		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone --max-ecku 0", fixture: "kafka/cluster/create-enterprise-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise", fixture: "kafka/cluster/create-enterprise-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --availability multi-zone", fixture: "kafka/cluster/create-freight.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight", fixture: "kafka/cluster/create-freight-low.golden"},

From 557bd9f9362a5abc5726cf7361e9554db044357d Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Thu, 25 Sep 2025 14:35:01 -0700
Subject: [PATCH 08/17] Fix update cluster issue with both type and max-ecku,
 update tests

---
 internal/kafka/command_cluster_update.go      | 151 +++++++++++++-----
 .../cluster/update-type-max-ecku-fail.golden  |   4 +
 .../update-type-max-ecku-success.golden       |  17 ++
 .../kafka/cluster/update-type-success.golden  |   1 +
 test/kafka_test.go                            |   3 +-
 test/test-server/cmk_handlers.go              |  20 ++-
 6 files changed, 156 insertions(+), 40 deletions(-)
 create mode 100644 test/fixtures/output/kafka/cluster/update-type-max-ecku-fail.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden

diff --git a/internal/kafka/command_cluster_update.go b/internal/kafka/command_cluster_update.go
index bb5dd63614..d284a74a22 100644
--- a/internal/kafka/command_cluster_update.go
+++ b/internal/kafka/command_cluster_update.go
@@ -109,43 +109,24 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 		if maxEcku < 1 {
 			return fmt.Errorf("`--max-ecku` value must be at least 1")
 		}
-		// should be taken cared at API backend
-		//if availability == "MULTI_ZONE" && maxEcku < 2 {
-		//	return fmt.Errorf("`--max-ecku` value must be at least 2 for high availability")
-		//}
-
-		if currentConfig.CmkV2Basic != nil {
-			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-				CmkV2Basic: &cmkv2.CmkV2Basic{
-					Kind:    "Basic",
-					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
-				},
-			}
-		} else if currentConfig.CmkV2Standard != nil {
-			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-				CmkV2Standard: &cmkv2.CmkV2Standard{
-					Kind:    "Standard",
-					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
-				},
+
+		targetType := c.getCurrentClusterType(currentConfig)
+		if cmd.Flags().Changed("type") {
+			newType, err := cmd.Flags().GetString("type")
+			if err != nil {
+				return err
 			}
-		} else if currentConfig.CmkV2Enterprise != nil {
-			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-				CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
-					Kind:    "Enterprise",
-					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
-				},
+			if newType == "" {
+				return fmt.Errorf("`--type` flag value must not be empty")
 			}
-		} else if currentConfig.CmkV2Freight != nil {
-			update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-				CmkV2Freight: &cmkv2.CmkV2Freight{
-					Kind:    "Freight",
-					MaxEcku: cmkv2.PtrInt32(int32(maxEcku)),
-				},
+			if currentConfig.CmkV2Basic == nil || strings.ToLower(newType) != "standard" {
+				return fmt.Errorf(`clusters can only be upgraded from "Basic" to "Standard"`)
 			}
+			targetType = "Standard"
 		}
-	}
 
-	if cmd.Flags().Changed("type") {
+		update.Spec.Config = c.createClusterConfig(targetType, int32(maxEcku))
+	} else if cmd.Flags().Changed("type") {
 		newType, err := cmd.Flags().GetString("type")
 		if err != nil {
 			return err
@@ -154,18 +135,18 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf("`--type` flag value must not be empty")
 		}
 
-		// Validate cluster type upgrade
 		currentConfig := currentCluster.GetSpec().Config
 		if currentConfig.CmkV2Basic == nil || strings.ToLower(newType) != "standard" {
 			return fmt.Errorf(`clusters can only be upgraded from "Basic" to "Standard"`)
 		}
 
-		// Set the new cluster type
-		update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Standard: &cmkv2.CmkV2Standard{
-				Kind: "Standard",
-			},
+		// When upgrading type without specifying max-ecku, preserve current max-ecku or let API use default
+		var currentMaxEcku *int32
+		if currentConfig.CmkV2Basic != nil && currentConfig.CmkV2Basic.MaxEcku != nil {
+			currentMaxEcku = currentConfig.CmkV2Basic.MaxEcku
 		}
+
+		update.Spec.Config = c.createClusterConfigWithOptionalMaxEcku("Standard", currentMaxEcku)
 	}
 
 	updatedCluster, err := c.V2Client.UpdateKafkaCluster(id, update)
@@ -180,6 +161,100 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 	return c.outputKafkaClusterDescription(cmd, &updatedCluster, true)
 }
 
+func (c *clusterCommand) getCurrentClusterType(config *cmkv2.CmkV2ClusterSpecConfigOneOf) string {
+	if config.CmkV2Basic != nil {
+		return "Basic"
+	} else if config.CmkV2Standard != nil {
+		return "Standard"
+	} else if config.CmkV2Enterprise != nil {
+		return "Enterprise"
+	} else if config.CmkV2Freight != nil {
+		return "Freight"
+	}
+	return "Basic"
+}
+
+func (c *clusterCommand) createClusterConfig(clusterType string, maxEcku int32) *cmkv2.CmkV2ClusterSpecUpdateConfigOneOf {
+	switch clusterType {
+	case "Basic":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Basic: &cmkv2.CmkV2Basic{
+				Kind:    "Basic",
+				MaxEcku: cmkv2.PtrInt32(maxEcku),
+			},
+		}
+	case "Standard":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Standard: &cmkv2.CmkV2Standard{
+				Kind:    "Standard",
+				MaxEcku: cmkv2.PtrInt32(maxEcku),
+			},
+		}
+	case "Enterprise":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
+				Kind:    "Enterprise",
+				MaxEcku: cmkv2.PtrInt32(maxEcku),
+			},
+		}
+	case "Freight":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Freight: &cmkv2.CmkV2Freight{
+				Kind:    "Freight",
+				MaxEcku: cmkv2.PtrInt32(maxEcku),
+			},
+		}
+	default:
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Basic: &cmkv2.CmkV2Basic{
+				Kind:    "Basic",
+				MaxEcku: cmkv2.PtrInt32(maxEcku),
+			},
+		}
+	}
+}
+
+// createClusterConfigWithOptionalMaxEcku creates cluster configuration with optional max-ecku (nil means API default)
+func (c *clusterCommand) createClusterConfigWithOptionalMaxEcku(clusterType string, maxEcku *int32) *cmkv2.CmkV2ClusterSpecUpdateConfigOneOf {
+	switch clusterType {
+	case "Basic":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Basic: &cmkv2.CmkV2Basic{
+				Kind:    "Basic",
+				MaxEcku: maxEcku,
+			},
+		}
+	case "Standard":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Standard: &cmkv2.CmkV2Standard{
+				Kind:    "Standard",
+				MaxEcku: maxEcku,
+			},
+		}
+	case "Enterprise":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
+				Kind:    "Enterprise",
+				MaxEcku: maxEcku,
+			},
+		}
+	case "Freight":
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Freight: &cmkv2.CmkV2Freight{
+				Kind:    "Freight",
+				MaxEcku: maxEcku,
+			},
+		}
+	default:
+		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Basic: &cmkv2.CmkV2Basic{
+				Kind:    "Basic",
+				MaxEcku: maxEcku,
+			},
+		}
+	}
+}
+
 func (c *clusterCommand) validateResize(cku int32, currentCluster *cmkv2.CmkV2Cluster) (int32, error) {
 	// Ensure the cluster is a Dedicated Cluster
 	if currentCluster.GetSpec().Config.CmkV2Dedicated == nil {
diff --git a/test/fixtures/output/kafka/cluster/update-type-max-ecku-fail.golden b/test/fixtures/output/kafka/cluster/update-type-max-ecku-fail.golden
new file mode 100644
index 0000000000..065d62ce5b
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-type-max-ecku-fail.golden
@@ -0,0 +1,4 @@
+Error: failed to update Kafka cluster: failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for STANDARD SKU
+
+Suggestions:
+    A cluster can't be updated while still provisioning. If you just created this cluster, retry in a few minutes.
diff --git a/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden b/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden
new file mode 100644
index 0000000000..9b2a3915f9
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update                |
+| Name                 |                           |
+| Type                 | STANDARD                  |
+| Ingress Limit (MB/s) | 250                       |
+| Egress Limit (MB/s)  | 750                       |
+| Storage              | Infinite                  |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | single-zone               |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 6                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-type-success.golden b/test/fixtures/output/kafka/cluster/update-type-success.golden
index 6a1a77ef3a..8465ec5c92 100644
--- a/test/fixtures/output/kafka/cluster/update-type-success.golden
+++ b/test/fixtures/output/kafka/cluster/update-type-success.golden
@@ -12,5 +12,6 @@
 | Status               | UP                        |
 | Endpoint             | SASL_SSL://kafka-endpoint |
 | REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 10                        |
 | Topic Count          | 2                         |
 +----------------------+---------------------------+
diff --git a/test/kafka_test.go b/test/kafka_test.go
index b03fdfb900..034d81abcc 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -58,7 +58,8 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update-standard --max-ecku 2", fixture: "kafka/cluster/update-standard-max-ecku.golden"},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},
-		{args: "kafka cluster update lkc-update --type Standard", fixture: "kafka/cluster/update-type-success.golden"},
+		{args: "kafka cluster update lkc-update --type standard --max-ecku 6", fixture: "kafka/cluster/update-type-max-ecku-success.golden"},
+		{args: "kafka cluster update lkc-update --type standard --max-ecku 35", fixture: "kafka/cluster/update-type-max-ecku-fail.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --type", fixture: "kafka/cluster/update-type-empty-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --type basic", fixture: "kafka/cluster/update-type-invalid-error.golden", exitCode: 1},
 
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 2bf269d528..5aca9fcc5f 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -282,7 +282,18 @@ func handleCmkKafkaClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 						Kind: "Standard",
 					},
 				}
-				err := json.NewEncoder(w).Encode(cluster)
+
+				if req.Spec.Config.CmkV2Standard.MaxEcku == nil {
+					cluster.Spec.Config.CmkV2Standard.SetMaxEcku(10)
+				} else if *req.Spec.Config.CmkV2Standard.MaxEcku > 10 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for STANDARD SKU")
+					require.NoError(t, err)
+					return
+				} else {
+					cluster.Spec.Config.CmkV2Standard.SetMaxEcku(*req.Spec.Config.CmkV2Standard.MaxEcku)
+				}
+
+				err = json.NewEncoder(w).Encode(cluster)
 				require.NoError(t, err)
 				return
 			}
@@ -334,6 +345,13 @@ func handleCmkKafkaStandardClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 					},
 				}
 				err := json.NewEncoder(w).Encode(cluster)
+
+				if req.Spec.Config.CmkV2Standard.MaxEcku != nil && *req.Spec.Config.CmkV2Standard.MaxEcku > 10 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for STANDARD SKU")
+					require.NoError(t, err)
+					return
+				}
+
 				require.NoError(t, err)
 				return
 			}

From 3625e24f7c4adbb5a3edac1f0691144a18fb9884 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Thu, 25 Sep 2025 15:56:22 -0700
Subject: [PATCH 09/17] Refactor update cluster command

---
 internal/kafka/command_cluster_update.go | 53 +++---------------------
 1 file changed, 6 insertions(+), 47 deletions(-)

diff --git a/internal/kafka/command_cluster_update.go b/internal/kafka/command_cluster_update.go
index d284a74a22..bb3378e52d 100644
--- a/internal/kafka/command_cluster_update.go
+++ b/internal/kafka/command_cluster_update.go
@@ -140,13 +140,13 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf(`clusters can only be upgraded from "Basic" to "Standard"`)
 		}
 
-		// When upgrading type without specifying max-ecku, preserve current max-ecku or let API use default
-		var currentMaxEcku *int32
-		if currentConfig.CmkV2Basic != nil && currentConfig.CmkV2Basic.MaxEcku != nil {
-			currentMaxEcku = currentConfig.CmkV2Basic.MaxEcku
+		// When upgrading type without specifying max-ecku, use default max-ecku value for Standard cluster returned by API
+		// Set the new cluster type
+		update.Spec.Config = &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
+			CmkV2Standard: &cmkv2.CmkV2Standard{
+				Kind: "Standard",
+			},
 		}
-
-		update.Spec.Config = c.createClusterConfigWithOptionalMaxEcku("Standard", currentMaxEcku)
 	}
 
 	updatedCluster, err := c.V2Client.UpdateKafkaCluster(id, update)
@@ -214,47 +214,6 @@ func (c *clusterCommand) createClusterConfig(clusterType string, maxEcku int32)
 	}
 }
 
-// createClusterConfigWithOptionalMaxEcku creates cluster configuration with optional max-ecku (nil means API default)
-func (c *clusterCommand) createClusterConfigWithOptionalMaxEcku(clusterType string, maxEcku *int32) *cmkv2.CmkV2ClusterSpecUpdateConfigOneOf {
-	switch clusterType {
-	case "Basic":
-		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Basic: &cmkv2.CmkV2Basic{
-				Kind:    "Basic",
-				MaxEcku: maxEcku,
-			},
-		}
-	case "Standard":
-		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Standard: &cmkv2.CmkV2Standard{
-				Kind:    "Standard",
-				MaxEcku: maxEcku,
-			},
-		}
-	case "Enterprise":
-		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
-				Kind:    "Enterprise",
-				MaxEcku: maxEcku,
-			},
-		}
-	case "Freight":
-		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Freight: &cmkv2.CmkV2Freight{
-				Kind:    "Freight",
-				MaxEcku: maxEcku,
-			},
-		}
-	default:
-		return &cmkv2.CmkV2ClusterSpecUpdateConfigOneOf{
-			CmkV2Basic: &cmkv2.CmkV2Basic{
-				Kind:    "Basic",
-				MaxEcku: maxEcku,
-			},
-		}
-	}
-}
-
 func (c *clusterCommand) validateResize(cku int32, currentCluster *cmkv2.CmkV2Cluster) (int32, error) {
 	// Ensure the cluster is a Dedicated Cluster
 	if currentCluster.GetSpec().Config.CmkV2Dedicated == nil {

From bb099ad287fc6ca89baf0735614ca8126a7dc9b9 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Fri, 3 Oct 2025 15:24:51 -0700
Subject: [PATCH 10/17] Address comments

---
 internal/kafka/command_cluster_create.go                    | 6 ------
 .../kafka/cluster/create-enterprise-max-ecku-error.golden   | 1 -
 .../kafka/cluster/create-freight-max-ecku-error.golden      | 1 -
 .../output/kafka/cluster/update-max-ecku-error.golden       | 1 -
 test/kafka_test.go                                          | 3 ---
 5 files changed, 12 deletions(-)
 delete mode 100644 test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
 delete mode 100644 test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
 delete mode 100644 test/fixtures/output/kafka/cluster/update-max-ecku-error.golden

diff --git a/internal/kafka/command_cluster_create.go b/internal/kafka/command_cluster_create.go
index 98a71922b4..b99d548a82 100644
--- a/internal/kafka/command_cluster_create.go
+++ b/internal/kafka/command_cluster_create.go
@@ -145,12 +145,6 @@ func (c *clusterCommand) create(cmd *cobra.Command, args []string) error {
 		if clusterType == skuDedicated {
 			return errors.NewErrorWithSuggestions("the `--max-ecku` flag can only be used when creating a Basic, Standard, Enterprise, or Freight Kafka cluster", "Specify a different cluster with `--type` flag.")
 		}
-		if maxEcku < 1 {
-			return fmt.Errorf("`--max-ecku` value must be at least 1")
-		}
-		//if availability == "MULTI_ZONE" && maxEcku < 2 {
-		//	return fmt.Errorf("`--max-ecku` value must be at least 2 for high availability")
-		//}
 
 		if clusterType == skuBasic {
 			createCluster.Spec.Config.CmkV2Basic.MaxEcku = cmkv2.PtrInt32(int32(maxEcku))
diff --git a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
deleted file mode 100644
index 88f2f76c1a..0000000000
--- a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku-error.golden
+++ /dev/null
@@ -1 +0,0 @@
-Error: `--max-ecku` value must be at least 1
diff --git a/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
deleted file mode 100644
index 88f2f76c1a..0000000000
--- a/test/fixtures/output/kafka/cluster/create-freight-max-ecku-error.golden
+++ /dev/null
@@ -1 +0,0 @@
-Error: `--max-ecku` value must be at least 1
diff --git a/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden b/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden
deleted file mode 100644
index 88f2f76c1a..0000000000
--- a/test/fixtures/output/kafka/cluster/update-max-ecku-error.golden
+++ /dev/null
@@ -1 +0,0 @@
-Error: `--max-ecku` value must be at least 1
diff --git a/test/kafka_test.go b/test/kafka_test.go
index 034d81abcc..7377e153d3 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -34,12 +34,10 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --availability oops-zone", fixture: "kafka/cluster/create-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone", fixture: "kafka/cluster/create-enterprise.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone --max-ecku 4", fixture: "kafka/cluster/create-enterprise-max-ecku.golden"},
-		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise --availability multi-zone --max-ecku 0", fixture: "kafka/cluster/create-enterprise-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type enterprise", fixture: "kafka/cluster/create-enterprise-availability-zone-error.golden", exitCode: 1},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --availability multi-zone", fixture: "kafka/cluster/create-freight.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight", fixture: "kafka/cluster/create-freight-low.golden"},
 		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --max-ecku 3", fixture: "kafka/cluster/create-freight-max-ecku.golden"},
-		{args: "kafka cluster create my-new-cluster --cloud aws --region us-east-1 --type freight --max-ecku 0", fixture: "kafka/cluster/create-freight-max-ecku-error.golden", exitCode: 1},
 
 		{args: "kafka cluster update lkc-update", fixture: "kafka/cluster/create-flag-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --name lkc-update-name", fixture: "kafka/26.golden"},
@@ -54,7 +52,6 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update-dedicated-shrink-multi --cku 1", fixture: "kafka/cluster/update-dedicated-shrink-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --cku 1", fixture: "kafka/cluster/update-resize-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --max-ecku 4", fixture: "kafka/cluster/update-max-ecku.golden"},
-		{args: "kafka cluster update lkc-update --max-ecku 0", fixture: "kafka/cluster/update-max-ecku-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update-standard --max-ecku 2", fixture: "kafka/cluster/update-standard-max-ecku.golden"},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},

From 1b0351804ebf0fcadb3261ba3340c49b4a228cd8 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Tue, 9 Dec 2025 16:22:17 -0800
Subject: [PATCH 11/17] Fix conflicts due to merge

---
 internal/kafka/command_cluster_describe.go    | 17 +++++++----
 internal/kafka/utils.go                       | 29 ++++---------------
 .../create-basic-with-ecku-limits.golden      |  4 +--
 .../cluster/create-enterprise-max-ecku.golden |  6 ++--
 .../cluster/create-freight-max-ecku.golden    |  6 ++--
 .../create-standard-with-ecku-limits.golden   |  4 +--
 .../describe-basic-with-ecku-limits.golden    |  1 +
 .../update-basic-with-ecku-limits.golden      |  1 +
 .../kafka/cluster/update-max-ecku.golden      |  2 +-
 .../cluster/update-standard-max-ecku.golden   |  2 +-
 .../update-type-max-ecku-success.golden       |  2 +-
 .../output/kafka/create-basic-max-ecku.golden |  2 +-
 test/test-server/cmk_handlers.go              | 18 +++++-------
 13 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/internal/kafka/command_cluster_describe.go b/internal/kafka/command_cluster_describe.go
index 554a11cb0e..feab1107a4 100644
--- a/internal/kafka/command_cluster_describe.go
+++ b/internal/kafka/command_cluster_describe.go
@@ -134,10 +134,10 @@ func (c *clusterCommand) outputKafkaClusterDescription(cmd *cobra.Command, clust
 }
 
 func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, usageLimits *kafkausagelimits.UsageLimits, ctx *config.Context) *describeStruct {
-	var maxEckuVal int32
-	if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
-		maxEckuVal = *maxEckuPtr
-	}
+	//var maxEckuVal int32
+	//if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
+	//	maxEckuVal = *maxEckuPtr
+	//}
 
 	out := &describeStruct{
 		IsCurrent:          cluster.GetId() == ctx.KafkaClusterContext.GetActiveKafkaClusterId(),
@@ -155,7 +155,7 @@ func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, usageLimits *ka
 		ByokKeyId:          getCmkByokId(cluster),
 		EncryptionKeyId:    getCmkEncryptionKey(cluster),
 		RestEndpoint:       cluster.Spec.GetHttpEndpoint(),
-		MaxEcku:            maxEckuVal, // omitted by omitempty when zero or when field is filtered out
+		MaxEcku:            getCmkMaxEcku(cluster),
 	}
 
 	// Only set limits field if usage limits are available
@@ -199,7 +199,12 @@ func getKafkaClusterDescribeFields(cluster *cmkv2.CmkV2Cluster, basicFields []st
 			describeFields = append(describeFields, "ByokId")
 		}
 	} else {
-		describeFields = append(describeFields, "MaxEcku") // Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
+		// Max eCKU field is available only for Basic, Standard, Enterprise, and Freight clusters
+		// Only show it if the value is positive (non-positive values like -1 indicate it's not set)
+		maxEcku := getCmkMaxEcku(cluster)
+		if maxEcku > 0 {
+			describeFields = append(describeFields, "MaxEcku")
+		}
 	}
 
 	if getTopicCount {
diff --git a/internal/kafka/utils.go b/internal/kafka/utils.go
index 0e5e5ab1e1..082a86a654 100644
--- a/internal/kafka/utils.go
+++ b/internal/kafka/utils.go
@@ -116,23 +116,6 @@ func getCmkClusterType(cluster *cmkv2.CmkV2Cluster) string {
 	return ccstructs.Sku_name[0] // UNKNOWN
 }
 
-func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) int32 {
-	if isBasic(cluster) {
-		return cluster.Spec.Config.CmkV2Basic.GetMaxEcku()
-	}
-	if isStandard(cluster) {
-		return cluster.Spec.Config.CmkV2Standard.GetMaxEcku()
-	}
-	if isEnterprise(cluster) {
-		return cluster.Spec.Config.CmkV2Enterprise.GetMaxEcku()
-	}
-	if isFreight(cluster) {
-		return cluster.Spec.Config.CmkV2Freight.GetMaxEcku()
-	}
-
-	return -1
-}
-
 func getCmkClusterSize(cluster *cmkv2.CmkV2Cluster) int32 {
 	if isDedicated(cluster) {
 		return *cluster.Status.Cku
@@ -147,17 +130,17 @@ func getCmkClusterPendingSize(cluster *cmkv2.CmkV2Cluster) int32 {
 	return -1
 }
 
-func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) *int32 {
+func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) int32 {
 	if isBasic(cluster) {
-		return cluster.Spec.Config.CmkV2Basic.MaxEcku
+		return cluster.GetSpec().Config.CmkV2Basic.GetMaxEcku()
 	} else if isStandard(cluster) {
-		return cluster.Spec.Config.CmkV2Standard.MaxEcku
+		return cluster.GetSpec().Config.CmkV2Standard.GetMaxEcku()
 	} else if isEnterprise(cluster) {
-		return cluster.Spec.Config.CmkV2Enterprise.MaxEcku
+		return cluster.GetSpec().Config.CmkV2Enterprise.GetMaxEcku()
 	} else if isFreight(cluster) {
-		return cluster.Spec.Config.CmkV2Freight.MaxEcku
+		return cluster.GetSpec().Config.CmkV2Freight.GetMaxEcku()
 	}
-	return nil
+	return -1
 }
 
 func getCmkByokId(cluster *cmkv2.CmkV2Cluster) string {
diff --git a/test/fixtures/output/kafka/cluster/create-basic-with-ecku-limits.golden b/test/fixtures/output/kafka/cluster/create-basic-with-ecku-limits.golden
index aac6d8378d..559718c63f 100644
--- a/test/fixtures/output/kafka/cluster/create-basic-with-ecku-limits.golden
+++ b/test/fixtures/output/kafka/cluster/create-basic-with-ecku-limits.golden
@@ -4,8 +4,8 @@ It may take up to 5 minutes for the Kafka cluster to be ready.
 | ID                   | lkc-with-ecku-limits              |
 | Name                 | my-basic-cluster-with-ecku-limits |
 | Type                 | BASIC                             |
-| Ingress Limit (MB/s) | 25                                |
-| Egress Limit (MB/s)  | 75                                |
+| Ingress Limit (MB/s) | 250                               |
+| Egress Limit (MB/s)  | 750                               |
 | Storage              | 5000 GB                           |
 | Cloud                | aws                               |
 | Region               | us-west-2                         |
diff --git a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
index 3baaa8a1d6..ec0a3de673 100644
--- a/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
+++ b/test/fixtures/output/kafka/cluster/create-enterprise-max-ecku.golden
@@ -4,9 +4,9 @@ It may take up to 5 minutes for the Kafka cluster to be ready.
 | ID                   | lkc-def963                |
 | Name                 | my-new-cluster            |
 | Type                 | ENTERPRISE                |
-| Ingress Limit (MB/s) | 250                       |
-| Egress Limit (MB/s)  | 750                       |
-| Storage              | Infinite                  |
+| Ingress Limit (MB/s) | 240                       |
+| Egress Limit (MB/s)  | 720                       |
+| Storage              | Unlimited                 |
 | Cloud                | aws                       |
 | Region               | us-east-1                 |
 | Availability         | multi-zone                |
diff --git a/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden b/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
index 0904c5cc50..f5750a5db7 100644
--- a/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
+++ b/test/fixtures/output/kafka/cluster/create-freight-max-ecku.golden
@@ -4,9 +4,9 @@ It may take up to 5 minutes for the Kafka cluster to be ready.
 | ID                   | lkc-def963                |
 | Name                 | my-new-cluster            |
 | Type                 | FREIGHT                   |
-| Ingress Limit (MB/s) | 250                       |
-| Egress Limit (MB/s)  | 750                       |
-| Storage              | Infinite                  |
+| Ingress Limit (MB/s) | 180                       |
+| Egress Limit (MB/s)  | 540                       |
+| Storage              | Unlimited                 |
 | Cloud                | aws                       |
 | Region               | us-east-1                 |
 | Availability         | low                       |
diff --git a/test/fixtures/output/kafka/cluster/create-standard-with-ecku-limits.golden b/test/fixtures/output/kafka/cluster/create-standard-with-ecku-limits.golden
index f24a75954c..7a6a62963e 100644
--- a/test/fixtures/output/kafka/cluster/create-standard-with-ecku-limits.golden
+++ b/test/fixtures/output/kafka/cluster/create-standard-with-ecku-limits.golden
@@ -4,8 +4,8 @@ It may take up to 5 minutes for the Kafka cluster to be ready.
 | ID                   | lkc-with-ecku-limits                 |
 | Name                 | my-standard-cluster-with-ecku-limits |
 | Type                 | STANDARD                             |
-| Ingress Limit (MB/s) | 125                                  |
-| Egress Limit (MB/s)  | 375                                  |
+| Ingress Limit (MB/s) | 250                                  |
+| Egress Limit (MB/s)  | 750                                  |
 | Storage              | Unlimited                            |
 | Cloud                | aws                                  |
 | Region               | us-west-2                            |
diff --git a/test/fixtures/output/kafka/cluster/describe-basic-with-ecku-limits.golden b/test/fixtures/output/kafka/cluster/describe-basic-with-ecku-limits.golden
index 5503c05867..41f860ce36 100644
--- a/test/fixtures/output/kafka/cluster/describe-basic-with-ecku-limits.golden
+++ b/test/fixtures/output/kafka/cluster/describe-basic-with-ecku-limits.golden
@@ -12,5 +12,6 @@
 | Status               | UP                            |
 | Endpoint             | SASL_SSL://kafka-endpoint     |
 | REST Endpoint        | http://127.0.0.1:1025         |
+| Max eCKU             | 5                             |
 | Topic Count          | 2                             |
 +----------------------+-------------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-basic-with-ecku-limits.golden b/test/fixtures/output/kafka/cluster/update-basic-with-ecku-limits.golden
index 98028b21b4..e260479c13 100644
--- a/test/fixtures/output/kafka/cluster/update-basic-with-ecku-limits.golden
+++ b/test/fixtures/output/kafka/cluster/update-basic-with-ecku-limits.golden
@@ -12,5 +12,6 @@
 | Status               | UP                        |
 | Endpoint             | SASL_SSL://kafka-endpoint |
 | REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 5                         |
 | Topic Count          | 2                         |
 +----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-max-ecku.golden
index feee8c0da9..e0bd2e41ce 100644
--- a/test/fixtures/output/kafka/cluster/update-max-ecku.golden
+++ b/test/fixtures/output/kafka/cluster/update-max-ecku.golden
@@ -5,7 +5,7 @@
 | Type                 | BASIC                     |
 | Ingress Limit (MB/s) | 250                       |
 | Egress Limit (MB/s)  | 750                       |
-| Storage              | 5 TB                      |
+| Storage              | 5000 GB                   |
 | Cloud                | aws                       |
 | Region               | us-west-2                 |
 | Availability         | single-zone               |
diff --git a/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
index de10205a60..34d0feb165 100644
--- a/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
+++ b/test/fixtures/output/kafka/cluster/update-standard-max-ecku.golden
@@ -5,7 +5,7 @@
 | Type                 | STANDARD                  |
 | Ingress Limit (MB/s) | 250                       |
 | Egress Limit (MB/s)  | 750                       |
-| Storage              | Infinite                  |
+| Storage              | Unlimited                 |
 | Cloud                | aws                       |
 | Region               | us-west-2                 |
 | Availability         | single-zone               |
diff --git a/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden b/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden
index 9b2a3915f9..7377231241 100644
--- a/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden
+++ b/test/fixtures/output/kafka/cluster/update-type-max-ecku-success.golden
@@ -5,7 +5,7 @@
 | Type                 | STANDARD                  |
 | Ingress Limit (MB/s) | 250                       |
 | Egress Limit (MB/s)  | 750                       |
-| Storage              | Infinite                  |
+| Storage              | Unlimited                 |
 | Cloud                | aws                       |
 | Region               | us-west-2                 |
 | Availability         | single-zone               |
diff --git a/test/fixtures/output/kafka/create-basic-max-ecku.golden b/test/fixtures/output/kafka/create-basic-max-ecku.golden
index 17eb419ce7..45875acf82 100644
--- a/test/fixtures/output/kafka/create-basic-max-ecku.golden
+++ b/test/fixtures/output/kafka/create-basic-max-ecku.golden
@@ -6,7 +6,7 @@ It may take up to 5 minutes for the Kafka cluster to be ready.
 | Type                 | BASIC                     |
 | Ingress Limit (MB/s) | 250                       |
 | Egress Limit (MB/s)  | 750                       |
-| Storage              | 5 TB                      |
+| Storage              | 5000 GB                   |
 | Cloud                | aws                       |
 | Region               | us-east-1                 |
 | Availability         | single-zone               |
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 7c73d94cc8..c077a83c60 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -62,11 +62,10 @@ func handleCmkKafkaClusterCreate(t *testing.T) http.HandlerFunc {
 			}
 			cluster.Spec.Config.CmkV2Enterprise = &cmkv2.CmkV2Enterprise{Kind: "Enterprise"}
 			if req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
-				cluster.Spec.Config.CmkV2Enterprise.MaxEcku = getMaxEcku("", "Enterprise")
-				//cluster.Spec.Config.CmkV2Enterprise.MaxEcku = req.Spec.Config.CmkV2Enterprise.MaxEcku
+				// cluster.Spec.Config.CmkV2Enterprise.MaxEcku = getMaxEcku("", "Enterprise")
+				cluster.Spec.Config.CmkV2Enterprise.MaxEcku = req.Spec.Config.CmkV2Enterprise.MaxEcku
 			}
 
-
 		} else if req.Spec.Config.CmkV2Freight != nil {
 			if req.Spec.GetAvailability() == "SINGLE_ZONE" {
 				err := writeError(w, "Durability must be HIGH for an Freight cluster")
@@ -75,19 +74,18 @@ func handleCmkKafkaClusterCreate(t *testing.T) http.HandlerFunc {
 			}
 			cluster.Spec.Config.CmkV2Freight = &cmkv2.CmkV2Freight{Kind: "Freight"}
 			if req.Spec.Config.CmkV2Freight.MaxEcku != nil {
-				cluster.Spec.Config.CmkV2Freight.MaxEcku = getMaxEcku("", "Freight")
-				//cluster.Spec.Config.CmkV2Freight.MaxEcku = req.Spec.Config.CmkV2Freight.MaxEcku
+				// cluster.Spec.Config.CmkV2Freight.MaxEcku = getMaxEcku("", "Freight")
+				cluster.Spec.Config.CmkV2Freight.MaxEcku = req.Spec.Config.CmkV2Freight.MaxEcku
 			}
 		} else if req.Spec.Config.CmkV2Basic != nil {
 			cluster.Spec.Config.CmkV2Basic = &cmkv2.CmkV2Basic{Kind: "Basic"}
 			if req.Spec.Config.CmkV2Basic.MaxEcku != nil {
-				cluster.Spec.Config.CmkV2Basic.MaxEcku = getMaxEcku("", "Basic")
-				//cluster.Spec.Config.CmkV2Basic.MaxEcku = req.Spec.Config.CmkV2Basic.MaxEcku
+				cluster.Spec.Config.CmkV2Basic.MaxEcku = req.Spec.Config.CmkV2Basic.MaxEcku
 			}
-		} else {
+		} else if req.Spec.Config.CmkV2Standard != nil {
+			cluster.Spec.Config.CmkV2Standard = &cmkv2.CmkV2Standard{Kind: "Standard"}
 			if req.Spec.Config.CmkV2Standard.MaxEcku != nil {
-				cluster.Spec.Config.CmkV2Standard.MaxEcku = getMaxEcku("", "Standard")
-				//cluster.Spec.Config.CmkV2Standard.MaxEcku = req.Spec.Config.CmkV2Standard.MaxEcku
+				cluster.Spec.Config.CmkV2Standard.MaxEcku = req.Spec.Config.CmkV2Standard.MaxEcku
 			}
 		}
 

From f0566aa8a92ed8cf311272b47ee37364cf4f040f Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 13:46:32 -0800
Subject: [PATCH 12/17] Fix linter

---
 internal/kafka/utils.go          | 16 ++++++++++++----
 test/test-server/cmk_handlers.go |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/internal/kafka/utils.go b/internal/kafka/utils.go
index 082a86a654..5fe8cfd942 100644
--- a/internal/kafka/utils.go
+++ b/internal/kafka/utils.go
@@ -132,13 +132,21 @@ func getCmkClusterPendingSize(cluster *cmkv2.CmkV2Cluster) int32 {
 
 func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) int32 {
 	if isBasic(cluster) {
-		return cluster.GetSpec().Config.CmkV2Basic.GetMaxEcku()
+		if cluster.Spec.Config.CmkV2Basic.MaxEcku != nil {
+			return cluster.GetSpec().Config.CmkV2Basic.GetMaxEcku()
+		}
 	} else if isStandard(cluster) {
-		return cluster.GetSpec().Config.CmkV2Standard.GetMaxEcku()
+		if cluster.Spec.Config.CmkV2Standard.MaxEcku != nil {
+			return cluster.GetSpec().Config.CmkV2Standard.GetMaxEcku()
+		}
 	} else if isEnterprise(cluster) {
-		return cluster.GetSpec().Config.CmkV2Enterprise.GetMaxEcku()
+		if cluster.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+			return cluster.GetSpec().Config.CmkV2Enterprise.GetMaxEcku()
+		}
 	} else if isFreight(cluster) {
-		return cluster.GetSpec().Config.CmkV2Freight.GetMaxEcku()
+		if cluster.Spec.Config.CmkV2Freight.MaxEcku != nil {
+			return cluster.GetSpec().Config.CmkV2Freight.GetMaxEcku()
+		}
 	}
 	return -1
 }
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index c077a83c60..a6633d04b3 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -65,7 +65,6 @@ func handleCmkKafkaClusterCreate(t *testing.T) http.HandlerFunc {
 				// cluster.Spec.Config.CmkV2Enterprise.MaxEcku = getMaxEcku("", "Enterprise")
 				cluster.Spec.Config.CmkV2Enterprise.MaxEcku = req.Spec.Config.CmkV2Enterprise.MaxEcku
 			}
-
 		} else if req.Spec.Config.CmkV2Freight != nil {
 			if req.Spec.GetAvailability() == "SINGLE_ZONE" {
 				err := writeError(w, "Durability must be HIGH for an Freight cluster")

From 8b3b3c274aa4d7402eaa6889655c12ee754158ec Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 13:48:50 -0800
Subject: [PATCH 13/17] Nit

---
 internal/kafka/utils.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/kafka/utils.go b/internal/kafka/utils.go
index 5fe8cfd942..8df2dcdd23 100644
--- a/internal/kafka/utils.go
+++ b/internal/kafka/utils.go
@@ -132,19 +132,19 @@ func getCmkClusterPendingSize(cluster *cmkv2.CmkV2Cluster) int32 {
 
 func getCmkMaxEcku(cluster *cmkv2.CmkV2Cluster) int32 {
 	if isBasic(cluster) {
-		if cluster.Spec.Config.CmkV2Basic.MaxEcku != nil {
+		if cluster.GetSpec().Config.CmkV2Basic.MaxEcku != nil {
 			return cluster.GetSpec().Config.CmkV2Basic.GetMaxEcku()
 		}
 	} else if isStandard(cluster) {
-		if cluster.Spec.Config.CmkV2Standard.MaxEcku != nil {
+		if cluster.GetSpec().Config.CmkV2Standard.MaxEcku != nil {
 			return cluster.GetSpec().Config.CmkV2Standard.GetMaxEcku()
 		}
 	} else if isEnterprise(cluster) {
-		if cluster.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+		if cluster.GetSpec().Config.CmkV2Enterprise.MaxEcku != nil {
 			return cluster.GetSpec().Config.CmkV2Enterprise.GetMaxEcku()
 		}
 	} else if isFreight(cluster) {
-		if cluster.Spec.Config.CmkV2Freight.MaxEcku != nil {
+		if cluster.GetSpec().Config.CmkV2Freight.MaxEcku != nil {
 			return cluster.GetSpec().Config.CmkV2Freight.GetMaxEcku()
 		}
 	}

From 35e61ecc6a54097fb344afaa67b9747f99176c67 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 15:09:50 -0800
Subject: [PATCH 14/17] Address comments

---
 internal/kafka/command_cluster_describe.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/internal/kafka/command_cluster_describe.go b/internal/kafka/command_cluster_describe.go
index feab1107a4..00d64fbaaf 100644
--- a/internal/kafka/command_cluster_describe.go
+++ b/internal/kafka/command_cluster_describe.go
@@ -134,11 +134,6 @@ func (c *clusterCommand) outputKafkaClusterDescription(cmd *cobra.Command, clust
 }
 
 func convertClusterToDescribeStruct(cluster *cmkv2.CmkV2Cluster, usageLimits *kafkausagelimits.UsageLimits, ctx *config.Context) *describeStruct {
-	//var maxEckuVal int32
-	//if maxEckuPtr := getCmkMaxEcku(cluster); maxEckuPtr != nil {
-	//	maxEckuVal = *maxEckuPtr
-	//}
-
 	out := &describeStruct{
 		IsCurrent:          cluster.GetId() == ctx.KafkaClusterContext.GetActiveKafkaClusterId(),
 		Id:                 cluster.GetId(),

From cda6e9e8d150546afe097dddac3331f34a49f85e Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 17:06:26 -0800
Subject: [PATCH 15/17] Update test coverage

---
 test/kafka_test.go               |  4 ++
 test/test-server/cmk_handlers.go | 80 ++++++++++++++++++++++++++++++
 test/test-server/utils.go        | 84 ++++++++++++++++++++++++++++++++
 3 files changed, 168 insertions(+)

diff --git a/test/kafka_test.go b/test/kafka_test.go
index 7e4ee54deb..efbab60613 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -61,6 +61,10 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update --cku 1", fixture: "kafka/cluster/update-resize-error.golden", exitCode: 1},
 		{args: "kafka cluster update lkc-update --max-ecku 4", fixture: "kafka/cluster/update-max-ecku.golden"},
 		{args: "kafka cluster update lkc-update-standard --max-ecku 2", fixture: "kafka/cluster/update-standard-max-ecku.golden"},
+		{args: "kafka cluster update lkc-update-enterprise --max-ecku 5", fixture: "kafka/cluster/update-enterprise-max-ecku.golden"},
+		{args: "kafka cluster update lkc-update-enterprise --max-ecku 15", fixture: "kafka/cluster/update-enterprise-max-ecku-fail.golden", exitCode: 1},
+		{args: "kafka cluster update lkc-update-freight --max-ecku 50", fixture: "kafka/cluster/update-freight-max-ecku.golden"},
+		{args: "kafka cluster update lkc-update-freight --max-ecku 200", fixture: "kafka/cluster/update-freight-max-ecku-fail.golden", exitCode: 1},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},
 		{args: "kafka cluster update lkc-update --type standard --max-ecku 6", fixture: "kafka/cluster/update-type-max-ecku-success.golden"},
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index a6633d04b3..509bb590df 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -169,6 +169,10 @@ func handleCmkCluster(t *testing.T) http.HandlerFunc {
 			handleCmkKafkaClusterUpdateRequest(t)(w, r)
 		case "lkc-update-standard":
 			handleCmkKafkaStandardClusterUpdateRequest(t)(w, r)
+		case "lkc-update-enterprise":
+			handleCmkKafkaEnterpriseClusterUpdateRequest(t)(w, r)
+		case "lkc-update-freight":
+			handleCmkKafkaFreightClusterUpdateRequest(t)(w, r)
 		case "lkc-update-dedicated-expand":
 			handleCmkKafkaDedicatedClusterExpansion(t)(w, r)
 		case "lkc-update-dedicated-shrink":
@@ -369,6 +373,82 @@ func handleCmkKafkaStandardClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 	}
 }
 
+// Handler for GET/PATCH "/cmk/v2/clusters/lkc-update-enterprise"
+func handleCmkKafkaEnterpriseClusterUpdateRequest(t *testing.T) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			cluster := getCmkEnterpriseDescribeCluster("lkc-update-enterprise", "lkc-update-enterprise")
+			cluster.Status = &cmkv2.CmkV2ClusterStatus{Phase: "PROVISIONED"}
+			err := json.NewEncoder(w).Encode(cluster)
+			require.NoError(t, err)
+		case http.MethodPatch:
+			var req cmkv2.CmkV2Cluster
+			err := json.NewDecoder(r.Body).Decode(&req)
+			require.NoError(t, err)
+			req.Id = cmkv2.PtrString("lkc-update-enterprise")
+
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Enterprise != nil && req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+				cluster := getCmkEnterpriseDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
+						Kind:    "Enterprise",
+						MaxEcku: req.Spec.Config.CmkV2Enterprise.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+
+				if req.Spec.Config.CmkV2Enterprise.MaxEcku != nil && *req.Spec.Config.CmkV2Enterprise.MaxEcku > 10 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for ENTERPRISE SKU")
+					require.NoError(t, err)
+					return
+				}
+
+				require.NoError(t, err)
+				return
+			}
+		}
+	}
+}
+
+// Handler for GET/PATCH "/cmk/v2/clusters/lkc-update-freight"
+func handleCmkKafkaFreightClusterUpdateRequest(t *testing.T) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			cluster := getCmkFreightDescribeCluster("lkc-update-freight", "lkc-update-freight")
+			cluster.Status = &cmkv2.CmkV2ClusterStatus{Phase: "PROVISIONED"}
+			err := json.NewEncoder(w).Encode(cluster)
+			require.NoError(t, err)
+		case http.MethodPatch:
+			var req cmkv2.CmkV2Cluster
+			err := json.NewDecoder(r.Body).Decode(&req)
+			require.NoError(t, err)
+			req.Id = cmkv2.PtrString("lkc-update-freight")
+
+			if req.Spec.Config != nil && req.Spec.Config.CmkV2Freight != nil && req.Spec.Config.CmkV2Freight.MaxEcku != nil {
+				cluster := getCmkFreightDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
+				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
+					CmkV2Freight: &cmkv2.CmkV2Freight{
+						Kind:    "Freight",
+						MaxEcku: req.Spec.Config.CmkV2Freight.MaxEcku,
+					},
+				}
+				err := json.NewEncoder(w).Encode(cluster)
+
+				if req.Spec.Config.CmkV2Freight.MaxEcku != nil && *req.Spec.Config.CmkV2Freight.MaxEcku > 152 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 152 eCKUs for FREIGHT SKU")
+					require.NoError(t, err)
+					return
+				}
+
+				require.NoError(t, err)
+				return
+			}
+		}
+	}
+}
+
 // Handler for GET/PUT "/cmk/v2/clusters/lkc-update-dedicated-expand"
 func handleCmkKafkaDedicatedClusterExpansion(t *testing.T) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
diff --git a/test/test-server/utils.go b/test/test-server/utils.go
index 8df72149cd..c2b1c10bd6 100644
--- a/test/test-server/utils.go
+++ b/test/test-server/utils.go
@@ -470,6 +470,90 @@ func getCmkStandardDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
 	}
 }
 
+func getCmkEnterpriseDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
+	return &cmkv2.CmkV2Cluster{
+		Spec: &cmkv2.CmkV2ClusterSpec{
+			DisplayName: cmkv2.PtrString(name),
+			Cloud:       cmkv2.PtrString("aws"),
+			Region:      cmkv2.PtrString("us-west-2"),
+			Config: &cmkv2.CmkV2ClusterSpecConfigOneOf{
+				CmkV2Enterprise: &cmkv2.CmkV2Enterprise{Kind: "Enterprise"},
+			},
+			KafkaBootstrapEndpoint: cmkv2.PtrString("SASL_SSL://kafka-endpoint"),
+			HttpEndpoint:           cmkv2.PtrString(TestKafkaRestProxyUrl.String()),
+			Availability:           cmkv2.PtrString("MULTI_ZONE"),
+			Endpoints: &cmkv2.ModelMap{
+				"pni-abc123-enterprise": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pni-abc123-enterprise.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pni-abc123-enterprise.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PNI",
+				},
+				"privatelink-uvw456-enterprise": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-uvw456-enterprise.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-uvw456-enterprise.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"privatelink-xyz789-enterprise": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-xyz789-enterprise.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-xyz789-enterprise.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"public-0001-enterprise": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://public-0001-enterprise.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://public-0001-enterprise.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PUBLIC",
+				},
+			},
+		},
+		Id: cmkv2.PtrString(id),
+		Status: &cmkv2.CmkV2ClusterStatus{
+			Phase: "PROVISIONED",
+		},
+	}
+}
+
+func getCmkFreightDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
+	return &cmkv2.CmkV2Cluster{
+		Spec: &cmkv2.CmkV2ClusterSpec{
+			DisplayName: cmkv2.PtrString(name),
+			Cloud:       cmkv2.PtrString("aws"),
+			Region:      cmkv2.PtrString("us-west-2"),
+			Config: &cmkv2.CmkV2ClusterSpecConfigOneOf{
+				CmkV2Freight: &cmkv2.CmkV2Freight{Kind: "Freight"},
+			},
+			KafkaBootstrapEndpoint: cmkv2.PtrString("SASL_SSL://kafka-endpoint"),
+			HttpEndpoint:           cmkv2.PtrString(TestKafkaRestProxyUrl.String()),
+			Availability:           cmkv2.PtrString("MULTI_ZONE"),
+			Endpoints: &cmkv2.ModelMap{
+				"pni-abc123-freight": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pni-abc123-freight.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pni-abc123-freight.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PNI",
+				},
+				"privatelink-uvw456-freight": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-uvw456-freight.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-uvw456-freight.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"privatelink-xyz789-freight": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://pl-xyz789-freight.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://pl-xyz789-freight.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PRIVATELINK",
+				},
+				"public-0001-freight": cmkv2.CmkV2Endpoints{
+					KafkaBootstrapEndpoint: "SASL_SSL://public-0001-freight.kafka.us-west-2.aws.confluent.cloud:9092",
+					HttpEndpoint:           "https://public-0001-freight.rest.us-west-2.aws.confluent.cloud",
+					ConnectionType:         "PUBLIC",
+				},
+			},
+		},
+		Id: cmkv2.PtrString(id),
+		Status: &cmkv2.CmkV2ClusterStatus{
+			Phase: "PROVISIONED",
+		},
+	}
+}
+
 func getCmkUnknownDescribeCluster(id, name string) *cmkv2.CmkV2Cluster {
 	return &cmkv2.CmkV2Cluster{
 		Spec: &cmkv2.CmkV2ClusterSpec{

From e02b1e9d966d57ad9096aa0184f0b619f7d8d601 Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 17:28:11 -0800
Subject: [PATCH 16/17] Forgot a few files

---
 .../update-enterprise-max-ecku-fail.golden      |  4 ++++
 .../cluster/update-enterprise-max-ecku.golden   | 17 +++++++++++++++++
 .../cluster/update-freight-max-ecku-fail.golden |  4 ++++
 .../cluster/update-freight-max-ecku.golden      | 17 +++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku.golden

diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
new file mode 100644
index 0000000000..f4c2e18d66
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
@@ -0,0 +1,4 @@
+Error: failed to update Kafka cluster: invalid character '{' after top-level value
+
+Suggestions:
+    A cluster can't be updated while still provisioning. If you just created this cluster, retry in a few minutes.
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku.golden
new file mode 100644
index 0000000000..9de273af1d
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-enterprise     |
+| Name                 |                           |
+| Type                 | ENTERPRISE                |
+| Ingress Limit (MB/s) | 300                       |
+| Egress Limit (MB/s)  | 900                       |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 5                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
new file mode 100644
index 0000000000..f4c2e18d66
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
@@ -0,0 +1,4 @@
+Error: failed to update Kafka cluster: invalid character '{' after top-level value
+
+Suggestions:
+    A cluster can't be updated while still provisioning. If you just created this cluster, retry in a few minutes.
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku.golden
new file mode 100644
index 0000000000..7474503c02
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-freight        |
+| Name                 |                           |
+| Type                 | FREIGHT                   |
+| Ingress Limit (MB/s) | 3000                      |
+| Egress Limit (MB/s)  | 9000                      |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 50                        |
+| Topic Count          | 2                         |
++----------------------+---------------------------+

From 26328ecb9daef9530840c7a5ac4ff974a1137bcd Mon Sep 17 00:00:00 2001
From: Cynthia Qin <cqin@confluent.io>
Date: Wed, 10 Dec 2025 17:54:41 -0800
Subject: [PATCH 17/17] Add coverage

---
 .../update-enterprise-max-ecku-fail.golden    |  2 +-
 .../update-enterprise-max-ecku-json.golden    | 17 +++++++++++
 .../update-enterprise-max-ecku-max.golden     | 18 +++++++++++
 .../update-enterprise-max-ecku-min.golden     | 18 +++++++++++
 ...pdate-enterprise-max-ecku-with-name.golden | 17 +++++++++++
 .../update-enterprise-max-ecku-yaml.golden    | 15 ++++++++++
 .../update-freight-max-ecku-fail.golden       |  2 +-
 .../update-freight-max-ecku-json.golden       | 17 +++++++++++
 .../update-freight-max-ecku-max.golden        | 18 +++++++++++
 .../update-freight-max-ecku-min.golden        | 18 +++++++++++
 .../update-freight-max-ecku-with-name.golden  | 17 +++++++++++
 .../update-freight-max-ecku-yaml.golden       | 16 ++++++++++
 test/kafka_test.go                            |  5 ++++
 test/test-server/cmk_handlers.go              | 30 +++++++++----------
 14 files changed, 192 insertions(+), 18 deletions(-)
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-json.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-max.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-min.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-with-name.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-yaml.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-json.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-max.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-min.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-with-name.golden
 create mode 100644 test/fixtures/output/kafka/cluster/update-freight-max-ecku-yaml.golden

diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
index f4c2e18d66..5b49d24753 100644
--- a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-fail.golden
@@ -1,4 +1,4 @@
-Error: failed to update Kafka cluster: invalid character '{' after top-level value
+Error: failed to update Kafka cluster: failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for ENTERPRISE SKU
 
 Suggestions:
     A cluster can't be updated while still provisioning. If you just created this cluster, retry in a few minutes.
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-json.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-json.golden
new file mode 100644
index 0000000000..37a86d918a
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-json.golden
@@ -0,0 +1,17 @@
+{
+  "is_current": true,
+  "id": "lkc-update-enterprise",
+  "name": "",
+  "type": "ENTERPRISE",
+  "ingress_limit": 300,
+  "egress_limit": 900,
+  "storage": "Unlimited",
+  "cloud": "aws",
+  "region": "us-west-2",
+  "availability": "multi-zone",
+  "status": "UP",
+  "endpoint": "SASL_SSL://kafka-endpoint",
+  "rest_endpoint": "http://127.0.0.1:1025",
+  "max_ecku": 5,
+  "topic_count": 2
+}
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-max.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-max.golden
new file mode 100644
index 0000000000..142aff7381
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-max.golden
@@ -0,0 +1,18 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-enterprise     |
+| Name                 |                           |
+| Type                 | ENTERPRISE                |
+| Ingress Limit (MB/s) | 600                       |
+| Egress Limit (MB/s)  | 1800                      |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 10                        |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
+
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-min.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-min.golden
new file mode 100644
index 0000000000..b24ad3cfbe
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-min.golden
@@ -0,0 +1,18 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-enterprise     |
+| Name                 |                           |
+| Type                 | ENTERPRISE                |
+| Ingress Limit (MB/s) | 60                        |
+| Egress Limit (MB/s)  | 180                       |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 1                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
+
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-with-name.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-with-name.golden
new file mode 100644
index 0000000000..5c9899f15d
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-with-name.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-enterprise     |
+| Name                 | enterprise-cluster        |
+| Type                 | ENTERPRISE                |
+| Ingress Limit (MB/s) | 420                       |
+| Egress Limit (MB/s)  | 1260                      |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 7                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-yaml.golden b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-yaml.golden
new file mode 100644
index 0000000000..f85c1199d4
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-enterprise-max-ecku-yaml.golden
@@ -0,0 +1,15 @@
+is_current: true
+id: lkc-update-enterprise
+name: ""
+type: ENTERPRISE
+ingress_limit: 300
+egress_limit: 900
+storage: Unlimited
+cloud: aws
+region: us-west-2
+availability: multi-zone
+status: UP
+endpoint: SASL_SSL://kafka-endpoint
+rest_endpoint: http://127.0.0.1:1025
+max_ecku: 5
+topic_count: 2
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
index f4c2e18d66..80da380585 100644
--- a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-fail.golden
@@ -1,4 +1,4 @@
-Error: failed to update Kafka cluster: invalid character '{' after top-level value
+Error: failed to update Kafka cluster: failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 152 eCKUs for FREIGHT SKU
 
 Suggestions:
     A cluster can't be updated while still provisioning. If you just created this cluster, retry in a few minutes.
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-json.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-json.golden
new file mode 100644
index 0000000000..c94b54b835
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-json.golden
@@ -0,0 +1,17 @@
+{
+  "is_current": true,
+  "id": "lkc-update-freight",
+  "name": "",
+  "type": "FREIGHT",
+  "ingress_limit": 3000,
+  "egress_limit": 9000,
+  "storage": "Unlimited",
+  "cloud": "aws",
+  "region": "us-west-2",
+  "availability": "multi-zone",
+  "status": "UP",
+  "endpoint": "SASL_SSL://kafka-endpoint",
+  "rest_endpoint": "http://127.0.0.1:1025",
+  "max_ecku": 50,
+  "topic_count": 2
+}
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-max.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-max.golden
new file mode 100644
index 0000000000..1b8a902710
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-max.golden
@@ -0,0 +1,18 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-freight        |
+| Name                 |                           |
+| Type                 | FREIGHT                   |
+| Ingress Limit (MB/s) | 9120                      |
+| Egress Limit (MB/s)  | 27360                     |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 152                       |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
+
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-min.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-min.golden
new file mode 100644
index 0000000000..d9b34c668a
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-min.golden
@@ -0,0 +1,18 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-freight        |
+| Name                 |                           |
+| Type                 | FREIGHT                   |
+| Ingress Limit (MB/s) | 60                        |
+| Egress Limit (MB/s)  | 180                       |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 1                         |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
+
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-with-name.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-with-name.golden
new file mode 100644
index 0000000000..6b724df33d
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-with-name.golden
@@ -0,0 +1,17 @@
++----------------------+---------------------------+
+| Current              | true                      |
+| ID                   | lkc-update-freight        |
+| Name                 | freight-cluster           |
+| Type                 | FREIGHT                   |
+| Ingress Limit (MB/s) | 4500                      |
+| Egress Limit (MB/s)  | 13500                     |
+| Storage              | Unlimited                 |
+| Cloud                | aws                       |
+| Region               | us-west-2                 |
+| Availability         | multi-zone                |
+| Status               | UP                        |
+| Endpoint             | SASL_SSL://kafka-endpoint |
+| REST Endpoint        | http://127.0.0.1:1025     |
+| Max eCKU             | 75                        |
+| Topic Count          | 2                         |
++----------------------+---------------------------+
diff --git a/test/fixtures/output/kafka/cluster/update-freight-max-ecku-yaml.golden b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-yaml.golden
new file mode 100644
index 0000000000..5a29dd7439
--- /dev/null
+++ b/test/fixtures/output/kafka/cluster/update-freight-max-ecku-yaml.golden
@@ -0,0 +1,16 @@
+is_current: true
+id: lkc-update-freight
+name: ""
+type: FREIGHT
+ingress_limit: 3000
+egress_limit: 9000
+storage: Unlimited
+cloud: aws
+region: us-west-2
+availability: multi-zone
+status: UP
+endpoint: SASL_SSL://kafka-endpoint
+rest_endpoint: http://127.0.0.1:1025
+max_ecku: 50
+topic_count: 2
+
diff --git a/test/kafka_test.go b/test/kafka_test.go
index efbab60613..750388175d 100644
--- a/test/kafka_test.go
+++ b/test/kafka_test.go
@@ -63,8 +63,13 @@ func (s *CLITestSuite) TestKafka() {
 		{args: "kafka cluster update lkc-update-standard --max-ecku 2", fixture: "kafka/cluster/update-standard-max-ecku.golden"},
 		{args: "kafka cluster update lkc-update-enterprise --max-ecku 5", fixture: "kafka/cluster/update-enterprise-max-ecku.golden"},
 		{args: "kafka cluster update lkc-update-enterprise --max-ecku 15", fixture: "kafka/cluster/update-enterprise-max-ecku-fail.golden", exitCode: 1},
+		{args: "kafka cluster update lkc-update-enterprise --max-ecku 5 -o json", fixture: "kafka/cluster/update-enterprise-max-ecku-json.golden"},
+		{args: "kafka cluster update lkc-update-enterprise --max-ecku 5 -o yaml", fixture: "kafka/cluster/update-enterprise-max-ecku-yaml.golden"},
+		{args: "kafka cluster update lkc-update-enterprise --name enterprise-cluster --max-ecku 7", fixture: "kafka/cluster/update-enterprise-max-ecku-with-name.golden"},
 		{args: "kafka cluster update lkc-update-freight --max-ecku 50", fixture: "kafka/cluster/update-freight-max-ecku.golden"},
 		{args: "kafka cluster update lkc-update-freight --max-ecku 200", fixture: "kafka/cluster/update-freight-max-ecku-fail.golden", exitCode: 1},
+		{args: "kafka cluster update lkc-update-freight --max-ecku 50 -o json", fixture: "kafka/cluster/update-freight-max-ecku-json.golden"},
+		{args: "kafka cluster update lkc-update-freight --name freight-cluster --max-ecku 75", fixture: "kafka/cluster/update-freight-max-ecku-with-name.golden"},
 		// Type upgrade tests
 		{args: "kafka cluster update lkc-update --type standard", fixture: "kafka/cluster/update-type-success.golden"},
 		{args: "kafka cluster update lkc-update --type standard --max-ecku 6", fixture: "kafka/cluster/update-type-max-ecku-success.golden"},
diff --git a/test/test-server/cmk_handlers.go b/test/test-server/cmk_handlers.go
index 509bb590df..aa6f86d765 100644
--- a/test/test-server/cmk_handlers.go
+++ b/test/test-server/cmk_handlers.go
@@ -389,6 +389,12 @@ func handleCmkKafkaEnterpriseClusterUpdateRequest(t *testing.T) http.HandlerFunc
 			req.Id = cmkv2.PtrString("lkc-update-enterprise")
 
 			if req.Spec.Config != nil && req.Spec.Config.CmkV2Enterprise != nil && req.Spec.Config.CmkV2Enterprise.MaxEcku != nil {
+				if req.Spec.Config.CmkV2Enterprise.MaxEcku != nil && *req.Spec.Config.CmkV2Enterprise.MaxEcku > 10 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for ENTERPRISE SKU")
+					require.NoError(t, err)
+					return
+				}
+
 				cluster := getCmkEnterpriseDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
 				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
 					CmkV2Enterprise: &cmkv2.CmkV2Enterprise{
@@ -396,14 +402,7 @@ func handleCmkKafkaEnterpriseClusterUpdateRequest(t *testing.T) http.HandlerFunc
 						MaxEcku: req.Spec.Config.CmkV2Enterprise.MaxEcku,
 					},
 				}
-				err := json.NewEncoder(w).Encode(cluster)
-
-				if req.Spec.Config.CmkV2Enterprise.MaxEcku != nil && *req.Spec.Config.CmkV2Enterprise.MaxEcku > 10 {
-					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 10 eCKUs for ENTERPRISE SKU")
-					require.NoError(t, err)
-					return
-				}
-
+				err = json.NewEncoder(w).Encode(cluster)
 				require.NoError(t, err)
 				return
 			}
@@ -427,6 +426,12 @@ func handleCmkKafkaFreightClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 			req.Id = cmkv2.PtrString("lkc-update-freight")
 
 			if req.Spec.Config != nil && req.Spec.Config.CmkV2Freight != nil && req.Spec.Config.CmkV2Freight.MaxEcku != nil {
+				if req.Spec.Config.CmkV2Freight.MaxEcku != nil && *req.Spec.Config.CmkV2Freight.MaxEcku > 150 {
+					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 152 eCKUs for FREIGHT SKU")
+					require.NoError(t, err)
+					return
+				}
+
 				cluster := getCmkFreightDescribeCluster(req.GetId(), req.Spec.GetDisplayName())
 				cluster.Spec.Config = &cmkv2.CmkV2ClusterSpecConfigOneOf{
 					CmkV2Freight: &cmkv2.CmkV2Freight{
@@ -434,14 +439,7 @@ func handleCmkKafkaFreightClusterUpdateRequest(t *testing.T) http.HandlerFunc {
 						MaxEcku: req.Spec.Config.CmkV2Freight.MaxEcku,
 					},
 				}
-				err := json.NewEncoder(w).Encode(cluster)
-
-				if req.Spec.Config.CmkV2Freight.MaxEcku != nil && *req.Spec.Config.CmkV2Freight.MaxEcku > 152 {
-					err = writeError(w, "failed to update Kafka cluster: The specified Max eCKU exceeds the maximum allowed limit of 152 eCKUs for FREIGHT SKU")
-					require.NoError(t, err)
-					return
-				}
-
+				err = json.NewEncoder(w).Encode(cluster)
 				require.NoError(t, err)
 				return
 			}