Repository: knative-sandbox/eventing-kafka-broker
Pull request #65 (2020-07-28 09:06:32)

Rename broker repeated field from broker to brokers.
It's weird to have a list of objects with a singular name.

## Proposed Changes

- broker -> brokers.

knative-prow-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/65#" title="Author self-approved">pierDipi</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **grantr**
You can assign the PR to them by writing `/assign @grantr` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/knative-sandbox/eventing-kafka-broker/blob/master/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["grantr"]} -->
knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/65#" title="Author self-approved">pierDipi</a>*, *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/65#pullrequestreview-456496460" title="Approved">slinkydeveloper</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/knative-sandbox/eventing-kafka-broker/blob/master/OWNERS)~~ [slinkydeveloper]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
knative-prow-robot: @pierDipi: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-broker-unit-tests | d77b91db159f851a57ab758c042e39ae788f0e77 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/65/pull-knative-sandbox-eventing-kafka-broker-unit-tests/1288056161177702401) | `/test pull-knative-sandbox-eventing-kafka-broker-unit-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka-broker/65). [Your PR dashboard](https://gubernator.knative.dev/pr/pierDipi).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-prow-robot: New changes are detected. LGTM label has been removed.
slinkydeveloper: /lgtm

Patch:
diff --git a/control-plane/pkg/core/config/triggers.pb.go b/control-plane/pkg/core/config/triggers.pb.go
index 6fbd3dd22..14c6fa933 100644
--- a/control-plane/pkg/core/config/triggers.pb.go
+++ b/control-plane/pkg/core/config/triggers.pb.go
@@ -168,7 +168,7 @@ func (m *Broker) GetName() string {
 }
 
 type Brokers struct {
-	Broker []*Broker `protobuf:"bytes,1,rep,name=broker,proto3" json:"broker,omitempty"`
+	Brokers []*Broker `protobuf:"bytes,1,rep,name=brokers,proto3" json:"brokers,omitempty"`
 	// Count each config map update.
 	// Make sure each data plane pod has the same volume generation number.
 	VolumeGeneration     uint64   `protobuf:"varint,2,opt,name=volumeGeneration,proto3" json:"volumeGeneration,omitempty"`
@@ -202,9 +202,9 @@ func (m *Brokers) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Brokers proto.InternalMessageInfo
 
-func (m *Brokers) GetBroker() []*Broker {
+func (m *Brokers) GetBrokers() []*Broker {
 	if m != nil {
-		return m.Broker
+		return m.Brokers
 	}
 	return nil
 }
@@ -227,27 +227,27 @@ func init() { proto.RegisterFile("proto/def/triggers.proto", fileDescriptor_3cd3
 
 var fileDescriptor_3cd32e421bcc2dd3 = []byte{
 	// 355 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xc1, 0x4b, 0xc3, 0x30,
-	0x14, 0xc6, 0x69, 0xb7, 0x75, 0xdb, 0x1b, 0xce, 0x11, 0x3c, 0x04, 0x51, 0x1c, 0x43, 0x64, 0x08,
-	0x4b, 0x41, 0x2f, 0x43, 0xf0, 0xe0, 0x44, 0xbc, 0x78, 0xaa, 0xe2, 0x41, 0xf0, 0x90, 0xb5, 0x6f,
-	0x25, 0xb4, 0x4b, 0x4a, 0x9a, 0x15, 0xf6, 0x4f, 0x79, 0xf2, 0x0f, 0x94, 0xa6, 0xed, 0x36, 0xe6,
-	0xed, 0xbd, 0xdf, 0xf7, 0xe5, 0xe3, 0xf1, 0x11, 0xa0, 0x99, 0x56, 0x46, 0xf9, 0x11, 0xae, 0x7c,
-	0xa3, 0x45, 0x1c, 0xa3, 0xce, 0x99, 0x45, 0x93, 0x5f, 0x07, 0xba, 0x1f, 0x15, 0x22, 0x73, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0x4f, 0x4b, 0xc3, 0x40,
+	0x10, 0xc5, 0x49, 0xfa, 0x27, 0xed, 0x14, 0x6b, 0x59, 0x3c, 0x2c, 0xa2, 0x50, 0x8b, 0x48, 0x11,
+	0xba, 0x01, 0xbd, 0x14, 0xc1, 0x83, 0x15, 0xf1, 0xe2, 0x29, 0x7a, 0x10, 0xc1, 0xc3, 0x36, 0x99,
+	0x86, 0x25, 0xe9, 0x6e, 0xd8, 0x6c, 0x03, 0xfd, 0x52, 0x9e, 0xfc, 0x80, 0x92, 0x4d, 0xd2, 0x96,
+	0x7a, 0x9b, 0xf9, 0xbd, 0xb7, 0x8f, 0xe1, 0xb1, 0x40, 0x33, 0xad, 0x8c, 0xf2, 0x23, 0x5c, 0xf9,
+	0x46, 0x8b, 0x38, 0x46, 0x9d, 0x33, 0x8b, 0x26, 0xbf, 0x0e, 0x78, 0x1f, 0x15, 0x22, 0x73, 0x00,
 	0x6e, 0x8c, 0x16, 0xcb, 0x8d, 0xc1, 0x9c, 0x3a, 0xe3, 0xd6, 0x74, 0x70, 0x47, 0x59, 0xad, 0xb2,
 	0xa7, 0x9d, 0xf4, 0x22, 0x8d, 0xde, 0x06, 0x07, 0x5e, 0x32, 0x86, 0x41, 0x84, 0xb9, 0x11, 0x92,
 	0x1b, 0xa1, 0x24, 0x75, 0xc7, 0xce, 0xb4, 0x1f, 0x1c, 0x22, 0x32, 0x04, 0x57, 0x44, 0xb4, 0x65,
 	0x05, 0x57, 0x44, 0xe7, 0x8f, 0x70, 0x7a, 0x14, 0x48, 0x46, 0xd0, 0x4a, 0x70, 0x4b, 0x1d, 0xeb,
 	0x29, 0x47, 0x72, 0x06, 0x9d, 0x82, 0xa7, 0x1b, 0xac, 0x03, 0xab, 0xe5, 0xc1, 0x9d, 0x3b, 0x93,
-	0x1f, 0x07, 0xbc, 0x85, 0x56, 0x09, 0xea, 0x3a, 0xd9, 0x69, 0x92, 0xcb, 0x47, 0x46, 0x65, 0x22,
-	0x6c, 0x1e, 0xd9, 0x85, 0xdc, 0xc0, 0x30, 0x42, 0x1e, 0xbd, 0xa1, 0x31, 0xa8, 0xdf, 0x85, 0x4c,
-	0xea, 0x5b, 0x8e, 0x28, 0xb9, 0x86, 0x5e, 0xd3, 0x10, 0x6d, 0xdb, 0x06, 0x7a, 0x4d, 0x03, 0xc1,
-	0x4e, 0x21, 0x17, 0xd0, 0x97, 0x7c, 0x8d, 0x79, 0xc6, 0x43, 0xa4, 0x1d, 0x1b, 0xb4, 0x07, 0x84,
-	0x40, 0xbb, 0x5c, 0xa8, 0x67, 0x05, 0x3b, 0x4f, 0x3e, 0xa1, 0x5b, 0xdd, 0x9b, 0x93, 0x2b, 0xf0,
-	0x96, 0x76, 0xac, 0x2b, 0xee, 0xb2, 0x4a, 0x09, 0x6a, 0x4c, 0x6e, 0x61, 0x54, 0xa8, 0x74, 0xb3,
-	0xc6, 0x57, 0x94, 0xa8, 0xf7, 0x95, 0xb6, 0x83, 0x7f, 0x7c, 0xf1, 0x0d, 0xb3, 0x08, 0x0b, 0x96,
-	0x94, 0x35, 0x17, 0xc8, 0xb0, 0x40, 0x69, 0x84, 0x8c, 0x59, 0xc2, 0x57, 0x09, 0x67, 0x55, 0x20,
-	0x0b, 0x95, 0x46, 0x16, 0x2a, 0xb9, 0x12, 0xf1, 0xe2, 0xa4, 0x3e, 0xe3, 0xd9, 0xae, 0x5f, 0x97,
-	0xa1, 0x92, 0x46, 0xab, 0x74, 0x96, 0xa5, 0x5c, 0xa2, 0x9f, 0x25, 0xb1, 0x5f, 0xba, 0xfd, 0xca,
-	0xbd, 0xf4, 0xec, 0x2f, 0xb9, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xe1, 0x2e, 0x2c, 0x41,
+	0x1f, 0x07, 0xba, 0x0b, 0xad, 0x12, 0xd4, 0x75, 0xb2, 0xd3, 0x24, 0x97, 0x8f, 0x8c, 0xca, 0x44,
+	0xd8, 0x3c, 0xb2, 0x0b, 0xb9, 0x81, 0x61, 0x84, 0x3c, 0x7a, 0x43, 0x63, 0x50, 0xbf, 0x0b, 0x99,
+	0xd4, 0xb7, 0x1c, 0x51, 0x72, 0x0d, 0xbd, 0xa6, 0x21, 0xda, 0xb6, 0x0d, 0xf4, 0x9a, 0x06, 0x82,
+	0x9d, 0x42, 0x2e, 0xa0, 0x2f, 0xf9, 0x1a, 0xf3, 0x8c, 0x87, 0x48, 0x3b, 0x36, 0x68, 0x0f, 0x08,
+	0x81, 0x76, 0xb9, 0xd0, 0xae, 0x15, 0xec, 0x3c, 0xf9, 0x04, 0xaf, 0xba, 0x37, 0x27, 0x57, 0xe0,
+	0x2d, 0xab, 0xb1, 0xee, 0xd8, 0x63, 0x95, 0x14, 0x34, 0x9c, 0xdc, 0xc2, 0xa8, 0x50, 0xe9, 0x66,
+	0x8d, 0xaf, 0x28, 0x51, 0xef, 0x4b, 0x6d, 0x07, 0xff, 0xf8, 0xe2, 0x1b, 0x66, 0x11, 0x16, 0x2c,
+	0x29, 0x8b, 0x2e, 0x90, 0x61, 0x81, 0xd2, 0x08, 0x19, 0xb3, 0x84, 0xaf, 0x12, 0xce, 0xaa, 0x44,
+	0x16, 0x2a, 0x8d, 0x2c, 0x54, 0x72, 0x25, 0xe2, 0xc5, 0x49, 0x7d, 0xc8, 0xb3, 0x5d, 0xbf, 0x2e,
+	0x43, 0x25, 0x8d, 0x56, 0xe9, 0x2c, 0x4b, 0xb9, 0x44, 0x3f, 0x4b, 0x62, 0xbf, 0x74, 0xfb, 0x95,
+	0x7b, 0xd9, 0xb5, 0xff, 0xe4, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x25, 0x67, 0x41, 0x91, 0x43,
 	0x02, 0x00, 0x00,
 }
diff --git a/control-plane/pkg/log/log_marshaller.go b/control-plane/pkg/log/log_marshaller.go
index 343fcf79c..f74e76730 100644
--- a/control-plane/pkg/log/log_marshaller.go
+++ b/control-plane/pkg/log/log_marshaller.go
@@ -30,7 +30,7 @@ func (m BrokersMarshaller) MarshalLogObject(encoder zapcore.ObjectEncoder) error
 
 	return encoder.AddArray("brokers", zapcore.ArrayMarshalerFunc(func(encoder zapcore.ArrayEncoder) error {
 
-		for _, b := range m.Brokers.Broker {
+		for _, b := range m.Brokers.Brokers {
 			if err := encoder.AppendObject(brokerMarshaller{broker: b}); err != nil {
 				return err
 			}
diff --git a/control-plane/pkg/reconciler/broker/broker.go b/control-plane/pkg/reconciler/broker/broker.go
index 3c6ffb7c0..db9efc41b 100644
--- a/control-plane/pkg/reconciler/broker/broker.go
+++ b/control-plane/pkg/reconciler/broker/broker.go
@@ -120,12 +120,12 @@ func (r *Reconciler) reconcileKind(ctx context.Context, broker *eventing.Broker)
 	}
 	// Update brokersTriggers data with the new broker configuration
 	if brokerIndex != NoBroker {
-		brokersTriggers.Broker[brokerIndex] = brokerConfig
+		brokersTriggers.Brokers[brokerIndex] = brokerConfig
 
 		logger.Debug("Broker exists", zap.Int("index", brokerIndex))
 
 	} else {
-		brokersTriggers.Broker = append(brokersTriggers.Broker, brokerConfig)
+		brokersTriggers.Brokers = append(brokersTriggers.Brokers, brokerConfig)
 
 		logger.Debug("Broker doesn't exist")
 	}
@@ -329,7 +329,7 @@ func (r *Reconciler) SetDefaultTopicDetails(topicDetail sarama.TopicDetail) {
 func FindBroker(brokersTriggers *coreconfig.Brokers, broker *eventing.Broker) int {
 	// Find broker in brokersTriggers.
 	brokerIndex := NoBroker
-	for i, b := range brokersTriggers.Broker {
+	for i, b := range brokersTriggers.Brokers {
 		if b.Id == string(broker.UID) {
 			brokerIndex = i
 			break
@@ -339,7 +339,7 @@ func FindBroker(brokersTriggers *coreconfig.Brokers, broker *eventing.Broker) in
 }
 
 func deleteBroker(brokersTriggers *coreconfig.Brokers, index int) {
-	if len(brokersTriggers.Broker) == 1 {
+	if len(brokersTriggers.Brokers) == 1 {
 		*brokersTriggers = coreconfig.Brokers{
 			VolumeGeneration: brokersTriggers.VolumeGeneration,
 		}
@@ -347,7 +347,7 @@ func deleteBroker(brokersTriggers *coreconfig.Brokers, index int) {
 	}
 
 	// replace the broker to be deleted with the last one.
-	brokersTriggers.Broker[index] = brokersTriggers.Broker[len(brokersTriggers.Broker)-1]
+	brokersTriggers.Brokers[index] = brokersTriggers.Brokers[len(brokersTriggers.Brokers)-1]
 	// truncate the array.
-	brokersTriggers.Broker = brokersTriggers.Broker[:len(brokersTriggers.Broker)-1]
+	brokersTriggers.Brokers = brokersTriggers.Brokers[:len(brokersTriggers.Brokers)-1]
 }
diff --git a/control-plane/pkg/reconciler/trigger/trigger.go b/control-plane/pkg/reconciler/trigger/trigger.go
index cc52756be..d1c658a57 100644
--- a/control-plane/pkg/reconciler/trigger/trigger.go
+++ b/control-plane/pkg/reconciler/trigger/trigger.go
@@ -101,7 +101,7 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, trigger *eventing.Trigger
 
 	logger.Debug("Found Broker", zap.Int("brokerIndex", brokerIndex))
 
-	triggers := brokersTriggers.Broker[brokerIndex].Triggers
+	triggers := brokersTriggers.Brokers[brokerIndex].Triggers
 	triggerIndex := findTrigger(triggers, trigger)
 	if triggerIndex == noTrigger {
 		// The trigger is not there, resources associated with the Trigger are deleted accordingly.
@@ -111,7 +111,7 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, trigger *eventing.Trigger
 	logger.Debug("Found Trigger", zap.Int("triggerIndex", brokerIndex))
 
 	// Delete the Trigger from the config map data.
-	brokersTriggers.Broker[brokerIndex].Triggers = r.deleteTrigger(triggers, triggerIndex)
+	brokersTriggers.Brokers[brokerIndex].Triggers = r.deleteTrigger(triggers, triggerIndex)
 
 	// Increment volume generation
 	brokersTriggers.VolumeGeneration = incrementVolumeGeneration(brokersTriggers.VolumeGeneration)
@@ -227,7 +227,7 @@ func (r *Reconciler) reconcileKind(ctx context.Context, trigger *eventing.Trigge
 	if brokerIndex == brokerreconciler.NoBroker {
 		return statusConditionManager.brokerNotFoundInDataPlaneConfigMap()
 	}
-	triggerIndex := findTrigger(dataPlaneConfig.Broker[brokerIndex].Triggers, trigger)
+	triggerIndex := findTrigger(dataPlaneConfig.Brokers[brokerIndex].Triggers, trigger)
 
 	triggerConfig, err := r.GetTriggerConfig(trigger)
 	if err != nil {
@@ -237,12 +237,12 @@ func (r *Reconciler) reconcileKind(ctx context.Context, trigger *eventing.Trigge
 	statusConditionManager.subscriberResolved()
 
 	if triggerIndex == noTrigger {
-		dataPlaneConfig.Broker[brokerIndex].Triggers = append(
-			dataPlaneConfig.Broker[brokerIndex].Triggers,
+		dataPlaneConfig.Brokers[brokerIndex].Triggers = append(
+			dataPlaneConfig.Brokers[brokerIndex].Triggers,
 			&triggerConfig,
 		)
 	} else {
-		dataPlaneConfig.Broker[brokerIndex].Triggers[triggerIndex] = &triggerConfig
+		dataPlaneConfig.Brokers[brokerIndex].Triggers[triggerIndex] = &triggerConfig
 	}
 
 	// Increment volumeGeneration
diff --git a/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/ObjectsCreator.java b/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/ObjectsCreator.java
index 47f3eb382..edaf15dc7 100644
--- a/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/ObjectsCreator.java
+++ b/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/ObjectsCreator.java
@@ -64,7 +64,7 @@ public class ObjectsCreator implements Consumer<Brokers> {
 
     final Map<Broker, Set<Trigger<CloudEvent>>> objects = new HashMap<>();
 
-    for (final var broker : brokers.getBrokerList()) {
+    for (final var broker : brokers.getBrokersList()) {
       final var triggers = new HashSet<Trigger<CloudEvent>>(
           broker.getTriggersCount()
       );
diff --git a/data-plane/generated/src/main/java/dev/knative/eventing/kafka/broker/core/config/BrokersConfig.java b/data-plane/generated/src/main/java/dev/knative/eventing/kafka/broker/core/config/BrokersConfig.java
index ca9d1e45b..b23fa0e5b 100644
--- a/data-plane/generated/src/main/java/dev/knative/eventing/kafka/broker/core/config/BrokersConfig.java
+++ b/data-plane/generated/src/main/java/dev/knative/eventing/kafka/broker/core/config/BrokersConfig.java
@@ -2950,27 +2950,27 @@ public final class BrokersConfig {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
     java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> 
-        getBrokerList();
+        getBrokersList();
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBroker(int index);
+    dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBrokers(int index);
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    int getBrokerCount();
+    int getBrokersCount();
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
     java.util.List<? extends dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> 
-        getBrokerOrBuilderList();
+        getBrokersOrBuilderList();
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokerOrBuilder(
+    dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokersOrBuilder(
         int index);
 
     /**
@@ -2996,7 +2996,7 @@ public final class BrokersConfig {
       super(builder);
     }
     private Brokers() {
-      broker_ = java.util.Collections.emptyList();
+      brokers_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -3032,10 +3032,10 @@ public final class BrokersConfig {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                broker_ = new java.util.ArrayList<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker>();
+                brokers_ = new java.util.ArrayList<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              broker_.add(
+              brokers_.add(
                   input.readMessage(dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.parser(), extensionRegistry));
               break;
             }
@@ -3060,7 +3060,7 @@ public final class BrokersConfig {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          broker_ = java.util.Collections.unmodifiableList(broker_);
+          brokers_ = java.util.Collections.unmodifiableList(brokers_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -3079,39 +3079,39 @@ public final class BrokersConfig {
               dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers.class, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers.Builder.class);
     }
 
-    public static final int BROKER_FIELD_NUMBER = 1;
-    private java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> broker_;
+    public static final int BROKERS_FIELD_NUMBER = 1;
+    private java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> brokers_;
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    public java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> getBrokerList() {
-      return broker_;
+    public java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> getBrokersList() {
+      return brokers_;
     }
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
     public java.util.List<? extends dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> 
-        getBrokerOrBuilderList() {
-      return broker_;
+        getBrokersOrBuilderList() {
+      return brokers_;
     }
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    public int getBrokerCount() {
-      return broker_.size();
+    public int getBrokersCount() {
+      return brokers_.size();
     }
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBroker(int index) {
-      return broker_.get(index);
+    public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBrokers(int index) {
+      return brokers_.get(index);
     }
     /**
-     * <code>repeated .Broker broker = 1;</code>
+     * <code>repeated .Broker brokers = 1;</code>
      */
-    public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokerOrBuilder(
+    public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokersOrBuilder(
         int index) {
-      return broker_.get(index);
+      return brokers_.get(index);
     }
 
     public static final int VOLUMEGENERATION_FIELD_NUMBER = 2;
@@ -3142,8 +3142,8 @@ public final class BrokersConfig {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < broker_.size(); i++) {
-        output.writeMessage(1, broker_.get(i));
+      for (int i = 0; i < brokers_.size(); i++) {
+        output.writeMessage(1, brokers_.get(i));
       }
       if (volumeGeneration_ != 0L) {
         output.writeUInt64(2, volumeGeneration_);
@@ -3157,9 +3157,9 @@ public final class BrokersConfig {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < broker_.size(); i++) {
+      for (int i = 0; i < brokers_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, broker_.get(i));
+          .computeMessageSize(1, brokers_.get(i));
       }
       if (volumeGeneration_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -3180,8 +3180,8 @@ public final class BrokersConfig {
       }
       dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers other = (dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers) obj;
 
-      if (!getBrokerList()
-          .equals(other.getBrokerList())) return false;
+      if (!getBrokersList()
+          .equals(other.getBrokersList())) return false;
       if (getVolumeGeneration()
           != other.getVolumeGeneration()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -3195,9 +3195,9 @@ public final class BrokersConfig {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getBrokerCount() > 0) {
-        hash = (37 * hash) + BROKER_FIELD_NUMBER;
-        hash = (53 * hash) + getBrokerList().hashCode();
+      if (getBrokersCount() > 0) {
+        hash = (37 * hash) + BROKERS_FIELD_NUMBER;
+        hash = (53 * hash) + getBrokersList().hashCode();
       }
       hash = (37 * hash) + VOLUMEGENERATION_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -3330,17 +3330,17 @@ public final class BrokersConfig {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getBrokerFieldBuilder();
+          getBrokersFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (brokerBuilder_ == null) {
-          broker_ = java.util.Collections.emptyList();
+        if (brokersBuilder_ == null) {
+          brokers_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          brokerBuilder_.clear();
+          brokersBuilder_.clear();
         }
         volumeGeneration_ = 0L;
 
@@ -3371,14 +3371,14 @@ public final class BrokersConfig {
       public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers buildPartial() {
         dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers result = new dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers(this);
         int from_bitField0_ = bitField0_;
-        if (brokerBuilder_ == null) {
+        if (brokersBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            broker_ = java.util.Collections.unmodifiableList(broker_);
+            brokers_ = java.util.Collections.unmodifiableList(brokers_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
-          result.broker_ = broker_;
+          result.brokers_ = brokers_;
         } else {
-          result.broker_ = brokerBuilder_.build();
+          result.brokers_ = brokersBuilder_.build();
         }
         result.volumeGeneration_ = volumeGeneration_;
         onBuilt();
@@ -3429,29 +3429,29 @@ public final class BrokersConfig {
 
       public Builder mergeFrom(dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers other) {
         if (other == dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Brokers.getDefaultInstance()) return this;
-        if (brokerBuilder_ == null) {
-          if (!other.broker_.isEmpty()) {
-            if (broker_.isEmpty()) {
-              broker_ = other.broker_;
+        if (brokersBuilder_ == null) {
+          if (!other.brokers_.isEmpty()) {
+            if (brokers_.isEmpty()) {
+              brokers_ = other.brokers_;
               bitField0_ = (bitField0_ & ~0x00000001);
             } else {
-              ensureBrokerIsMutable();
-              broker_.addAll(other.broker_);
+              ensureBrokersIsMutable();
+              brokers_.addAll(other.brokers_);
             }
             onChanged();
           }
         } else {
-          if (!other.broker_.isEmpty()) {
-            if (brokerBuilder_.isEmpty()) {
-              brokerBuilder_.dispose();
-              brokerBuilder_ = null;
-              broker_ = other.broker_;
+          if (!other.brokers_.isEmpty()) {
+            if (brokersBuilder_.isEmpty()) {
+              brokersBuilder_.dispose();
+              brokersBuilder_ = null;
+              brokers_ = other.brokers_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              brokerBuilder_ = 
+              brokersBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getBrokerFieldBuilder() : null;
+                   getBrokersFieldBuilder() : null;
             } else {
-              brokerBuilder_.addAllMessages(other.broker_);
+              brokersBuilder_.addAllMessages(other.brokers_);
             }
           }
         }
@@ -3488,244 +3488,244 @@ public final class BrokersConfig {
       }
       private int bitField0_;
 
-      private java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> broker_ =
+      private java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> brokers_ =
         java.util.Collections.emptyList();
-      private void ensureBrokerIsMutable() {
+      private void ensureBrokersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          broker_ = new java.util.ArrayList<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker>(broker_);
+          brokers_ = new java.util.ArrayList<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker>(brokers_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> brokerBuilder_;
+          dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> brokersBuilder_;
 
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> getBrokerList() {
-        if (brokerBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(broker_);
+      public java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> getBrokersList() {
+        if (brokersBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(brokers_);
         } else {
-          return brokerBuilder_.getMessageList();
+          return brokersBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public int getBrokerCount() {
-        if (brokerBuilder_ == null) {
-          return broker_.size();
+      public int getBrokersCount() {
+        if (brokersBuilder_ == null) {
+          return brokers_.size();
         } else {
-          return brokerBuilder_.getCount();
+          return brokersBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBroker(int index) {
-        if (brokerBuilder_ == null) {
-          return broker_.get(index);
+      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker getBrokers(int index) {
+        if (brokersBuilder_ == null) {
+          return brokers_.get(index);
         } else {
-          return brokerBuilder_.getMessage(index);
+          return brokersBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder setBroker(
+      public Builder setBrokers(
           int index, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker value) {
-        if (brokerBuilder_ == null) {
+        if (brokersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBrokerIsMutable();
-          broker_.set(index, value);
+          ensureBrokersIsMutable();
+          brokers_.set(index, value);
           onChanged();
         } else {
-          brokerBuilder_.setMessage(index, value);
+          brokersBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder setBroker(
+      public Builder setBrokers(
           int index, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder builderForValue) {
-        if (brokerBuilder_ == null) {
-          ensureBrokerIsMutable();
-          broker_.set(index, builderForValue.build());
+        if (brokersBuilder_ == null) {
+          ensureBrokersIsMutable();
+          brokers_.set(index, builderForValue.build());
           onChanged();
         } else {
-          brokerBuilder_.setMessage(index, builderForValue.build());
+          brokersBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder addBroker(dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker value) {
-        if (brokerBuilder_ == null) {
+      public Builder addBrokers(dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker value) {
+        if (brokersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBrokerIsMutable();
-          broker_.add(value);
+          ensureBrokersIsMutable();
+          brokers_.add(value);
           onChanged();
         } else {
-          brokerBuilder_.addMessage(value);
+          brokersBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder addBroker(
+      public Builder addBrokers(
           int index, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker value) {
-        if (brokerBuilder_ == null) {
+        if (brokersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureBrokerIsMutable();
-          broker_.add(index, value);
+          ensureBrokersIsMutable();
+          brokers_.add(index, value);
           onChanged();
         } else {
-          brokerBuilder_.addMessage(index, value);
+          brokersBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder addBroker(
+      public Builder addBrokers(
           dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder builderForValue) {
-        if (brokerBuilder_ == null) {
-          ensureBrokerIsMutable();
-          broker_.add(builderForValue.build());
+        if (brokersBuilder_ == null) {
+          ensureBrokersIsMutable();
+          brokers_.add(builderForValue.build());
           onChanged();
         } else {
-          brokerBuilder_.addMessage(builderForValue.build());
+          brokersBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder addBroker(
+      public Builder addBrokers(
           int index, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder builderForValue) {
-        if (brokerBuilder_ == null) {
-          ensureBrokerIsMutable();
-          broker_.add(index, builderForValue.build());
+        if (brokersBuilder_ == null) {
+          ensureBrokersIsMutable();
+          brokers_.add(index, builderForValue.build());
           onChanged();
         } else {
-          brokerBuilder_.addMessage(index, builderForValue.build());
+          brokersBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder addAllBroker(
+      public Builder addAllBrokers(
           java.lang.Iterable<? extends dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker> values) {
-        if (brokerBuilder_ == null) {
-          ensureBrokerIsMutable();
+        if (brokersBuilder_ == null) {
+          ensureBrokersIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, broker_);
+              values, brokers_);
           onChanged();
         } else {
-          brokerBuilder_.addAllMessages(values);
+          brokersBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder clearBroker() {
-        if (brokerBuilder_ == null) {
-          broker_ = java.util.Collections.emptyList();
+      public Builder clearBrokers() {
+        if (brokersBuilder_ == null) {
+          brokers_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
-          brokerBuilder_.clear();
+          brokersBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public Builder removeBroker(int index) {
-        if (brokerBuilder_ == null) {
-          ensureBrokerIsMutable();
-          broker_.remove(index);
+      public Builder removeBrokers(int index) {
+        if (brokersBuilder_ == null) {
+          ensureBrokersIsMutable();
+          brokers_.remove(index);
           onChanged();
         } else {
-          brokerBuilder_.remove(index);
+          brokersBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder getBrokerBuilder(
+      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder getBrokersBuilder(
           int index) {
-        return getBrokerFieldBuilder().getBuilder(index);
+        return getBrokersFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokerOrBuilder(
+      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder getBrokersOrBuilder(
           int index) {
-        if (brokerBuilder_ == null) {
-          return broker_.get(index);  } else {
-          return brokerBuilder_.getMessageOrBuilder(index);
+        if (brokersBuilder_ == null) {
+          return brokers_.get(index);  } else {
+          return brokersBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
       public java.util.List<? extends dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> 
-           getBrokerOrBuilderList() {
-        if (brokerBuilder_ != null) {
-          return brokerBuilder_.getMessageOrBuilderList();
+           getBrokersOrBuilderList() {
+        if (brokersBuilder_ != null) {
+          return brokersBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(broker_);
+          return java.util.Collections.unmodifiableList(brokers_);
         }
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder addBrokerBuilder() {
-        return getBrokerFieldBuilder().addBuilder(
+      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder addBrokersBuilder() {
+        return getBrokersFieldBuilder().addBuilder(
             dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.getDefaultInstance());
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
-      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder addBrokerBuilder(
+      public dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder addBrokersBuilder(
           int index) {
-        return getBrokerFieldBuilder().addBuilder(
+        return getBrokersFieldBuilder().addBuilder(
             index, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.getDefaultInstance());
       }
       /**
-       * <code>repeated .Broker broker = 1;</code>
+       * <code>repeated .Broker brokers = 1;</code>
        */
       public java.util.List<dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder> 
-           getBrokerBuilderList() {
-        return getBrokerFieldBuilder().getBuilderList();
+           getBrokersBuilderList() {
+        return getBrokersFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder> 
-          getBrokerFieldBuilder() {
-        if (brokerBuilder_ == null) {
-          brokerBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getBrokersFieldBuilder() {
+        if (brokersBuilder_ == null) {
+          brokersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.Broker.Builder, dev.knative.eventing.kafka.broker.core.config.BrokersConfig.BrokerOrBuilder>(
-                  broker_,
+                  brokers_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
-          broker_ = null;
+          brokers_ = null;
         }
-        return brokerBuilder_;
+        return brokersBuilder_;
       }
 
       private long volumeGeneration_ ;
@@ -3857,11 +3857,11 @@ public final class BrokersConfig {
       " \001(\t:\0028\001\"x\n\006Broker\022\n\n\002id\030\001 \001(\t\022\r\n\005topic\030" +
       "\002 \001(\t\022\026\n\016deadLetterSink\030\003 \001(\t\022\032\n\010trigger" +
       "s\030\004 \003(\0132\010.Trigger\022\021\n\tnamespace\030\005 \001(\t\022\014\n\004" +
-      "name\030\006 \001(\t\"<\n\007Brokers\022\027\n\006broker\030\001 \003(\0132\007." +
-      "Broker\022\030\n\020volumeGeneration\030\002 \001(\004B]\n-dev." +
-      "knative.eventing.kafka.broker.core.confi" +
-      "gB\rBrokersConfigZ\035control-plane/pkg/core" +
-      "/configb\006proto3"
+      "name\030\006 \001(\t\"=\n\007Brokers\022\030\n\007brokers\030\001 \003(\0132\007" +
+      ".Broker\022\030\n\020volumeGeneration\030\002 \001(\004B]\n-dev" +
+      ".knative.eventing.kafka.broker.core.conf" +
+      "igB\rBrokersConfigZ\035control-plane/pkg/cor" +
+      "e/configb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3890,7 +3890,7 @@ public final class BrokersConfig {
     internal_static_Brokers_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Brokers_descriptor,
-        new java.lang.String[] { "Broker", "VolumeGeneration", });
+        new java.lang.String[] { "Brokers", "VolumeGeneration", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto/def/triggers.proto b/proto/def/triggers.proto
index a2c7c9546..8898946b4 100644
--- a/proto/def/triggers.proto
+++ b/proto/def/triggers.proto
@@ -42,7 +42,7 @@ message Broker {
 }
 
 message Brokers {
-  repeated Broker broker = 1;
+  repeated Broker brokers = 1;
 
   // Count each config map update.
   // Make sure each data plane pod has the same volume generation number.


Test patch:
diff --git a/control-plane/pkg/reconciler/broker/broker_test.go b/control-plane/pkg/reconciler/broker/broker_test.go
index ade96ed2a..d5b3d352e 100644
--- a/control-plane/pkg/reconciler/broker/broker_test.go
+++ b/control-plane/pkg/reconciler/broker/broker_test.go
@@ -110,7 +110,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID,
 							Topic:     GetTopic(),
@@ -162,7 +162,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             BrokerUUID,
 							Topic:          GetTopic(),
@@ -252,7 +252,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             BrokerUUID,
 							Topic:          GetTopic(),
@@ -302,7 +302,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID,
 							Topic:     GetTopic(),
@@ -338,7 +338,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -367,7 +367,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -427,7 +427,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 					},
 				),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -454,7 +454,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -510,7 +510,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 					},
 				),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -541,7 +541,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -587,7 +587,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -618,7 +618,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -667,7 +667,7 @@ func brokerReconciliation(t *testing.T, format string, configs Configs) {
 					},
 				),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -748,7 +748,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID,
 							Topic:     GetTopic(),
@@ -762,7 +762,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Key: testKey,
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker:           []*coreconfig.Broker{},
+					Brokers:          []*coreconfig.Broker{},
 					VolumeGeneration: 1,
 				}),
 			},
@@ -774,7 +774,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 					WithDelivery(),
 				),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             BrokerUUID,
 							Topic:          GetTopic(),
@@ -798,7 +798,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             BrokerUUID,
 							Topic:          GetTopic(),
@@ -865,7 +865,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -883,7 +883,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Key: testKey,
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -899,7 +899,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -917,7 +917,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Key: testKey,
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
@@ -936,7 +936,7 @@ func brokerFinalization(t *testing.T, format string, configs Configs) {
 			Objects: []runtime.Object{
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:             "5384faa4-6bdf-428d-b6c2-d6f89ce1d44b",
 							Topic:          "my-existing-topic-a",
diff --git a/control-plane/pkg/reconciler/trigger/trigger_test.go b/control-plane/pkg/reconciler/trigger/trigger_test.go
index f0a696cc6..88a9f353d 100644
--- a/control-plane/pkg/reconciler/trigger/trigger_test.go
+++ b/control-plane/pkg/reconciler/trigger/trigger_test.go
@@ -82,7 +82,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 				newTrigger(),
 				NewService(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID,
 							Topic:     GetTopic(),
@@ -102,7 +102,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID,
 							Topic:     GetTopic(),
@@ -143,7 +143,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 				newTrigger(),
 				NewService(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID + "z",
 							Topic:     GetTopic(),
@@ -192,7 +192,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:        BrokerUUID + "z",
 							Topic:     GetTopic(),
@@ -370,7 +370,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 				newTrigger(),
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
@@ -400,7 +400,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 				newTrigger(),
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
@@ -429,7 +429,7 @@ func triggerReconciliation(t *testing.T, format string, configs broker.Configs)
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
@@ -487,7 +487,7 @@ func triggerFinalizer(t *testing.T, format string, configs broker.Configs) {
 				newTrigger(),
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
@@ -516,7 +516,7 @@ func triggerFinalizer(t *testing.T, format string, configs broker.Configs) {
 			},
 			WantUpdates: []clientgotesting.UpdateActionImpl{
 				ConfigMapUpdate(&configs, &coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
@@ -548,7 +548,7 @@ func triggerFinalizer(t *testing.T, format string, configs broker.Configs) {
 				newTrigger(),
 				NewDeletedBroker(),
 				NewConfigMapFromBrokers(&coreconfig.Brokers{
-					Broker: []*coreconfig.Broker{
+					Brokers: []*coreconfig.Broker{
 						{
 							Id:    BrokerUUID,
 							Topic: GetTopic(),
diff --git a/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/file/FileWatcherTest.java b/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/file/FileWatcherTest.java
index 87945ef63..d4ab02431 100644
--- a/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/file/FileWatcherTest.java
+++ b/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/file/FileWatcherTest.java
@@ -42,11 +42,11 @@ public class FileWatcherTest {
     final var file = Files.createTempFile("fw-", "-fw").toFile();
 
     final var broker1 = Brokers.newBuilder()
-        .addBroker(broker1Unwrapped())
+        .addBrokers(broker1Unwrapped())
         .build();
 
     final var broker2 = Brokers.newBuilder()
-        .addBroker(broker2Unwrapped())
+        .addBrokers(broker2Unwrapped())
         .build();
 
     final var isFirst = new AtomicBoolean(true);
diff --git a/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/testing/utils/CoreObjects.java b/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/testing/utils/CoreObjects.java
index 9cd637451..8b53b749a 100644
--- a/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/testing/utils/CoreObjects.java
+++ b/data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/testing/utils/CoreObjects.java
@@ -45,8 +45,8 @@ public final class CoreObjects {
 
   public static Brokers brokers() {
     return Brokers.newBuilder()
-        .addBroker(broker1Unwrapped())
-        .addBroker(broker2Unwrapped())
+        .addBrokers(broker1Unwrapped())
+        .addBrokers(broker2Unwrapped())
         .build();
   }
 
diff --git a/data-plane/dispatcher/src/test/java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java b/data-plane/dispatcher/src/test/java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java
index 9025867c1..73e7b2dde 100644
--- a/data-plane/dispatcher/src/test/java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java
+++ b/data-plane/dispatcher/src/test/java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java
@@ -95,7 +95,7 @@ public class UnorderedConsumerTest {
     final var objectsCreator = new ObjectsCreator(brokersManager);
 
     final var brokers = brokers();
-    final var numTriggers = brokers.getBrokerList().stream()
+    final var numTriggers = brokers.getBrokersList().stream()
         .mapToInt(Broker::getTriggersCount)
         .sum();