diff --git a/api/event-bus.html b/api/event-bus.html
index 3778ade7a6..83988902c3 100644
--- a/api/event-bus.html
+++ b/api/event-bus.html
@@ -735,6 +735,18 @@ <h3 id="argoproj.io/v1alpha1.KafkaConfig">KafkaConfig
 </tr>
 <tr>
 <td>
+<code>version</code></br>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Kafka version, sarama defaults to the oldest supported stable version</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>topic</code></br>
 <em>
 string
@@ -797,19 +809,6 @@ <h3 id="argoproj.io/v1alpha1.KafkaConfig">KafkaConfig
 <p>Secret for auth</p>
 </td>
 </tr>
-<tr>
-<td>
-<code>streamConfig</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Optional configuration for the kafka, if specified, it will be merged with the default configuration in controller-config.
-It accepts a YAML format configuration, available fields include, &ldquo;maxRetry&rdquo;, &ldquo;configVersion (sarama config version)&rdquo;, &ldquo;requiredAcks&rdquo;, &ldquo;replication&rdquo;.</p>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="argoproj.io/v1alpha1.KafkaConsumerGroup">KafkaConsumerGroup
diff --git a/api/event-bus.md b/api/event-bus.md
index d4435cfceb..b135016426 100644
--- a/api/event-bus.md
+++ b/api/event-bus.md
@@ -739,6 +739,17 @@ URL to kafka cluster, multiple URLs separated by comma
 </tr>
 <tr>
 <td>
+<code>version</code></br> <em> string </em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>
+Kafka version, sarama defaults to the oldest supported stable version
+</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>topic</code></br> <em> string </em>
 </td>
 <td>
@@ -798,20 +809,6 @@ Secret for auth
 </p>
 </td>
 </tr>
-<tr>
-<td>
-<code>streamConfig</code></br> <em> string </em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>
-Optional configuration for the kafka, if specified, it will be merged
-with the default configuration in controller-config. It accepts a YAML
-format configuration, available fields include, “maxRetry”,
-“configVersion (sarama config version)”, “requiredAcks”, “replication”.
-</p>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="argoproj.io/v1alpha1.KafkaConsumerGroup">
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
index a436a136d0..4a23ca6f0b 100644
--- a/api/jsonschema/schema.json
+++ b/api/jsonschema/schema.json
@@ -547,10 +547,6 @@
           "$ref": "#/definitions/io.argoproj.common.SASLConfig",
           "description": "SASL configuration for the kafka client"
         },
-        "streamConfig": {
-          "description": "Optional configuration for the kafka, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxRetry\", \"configVersion (sarama config version)\", \"requiredAcks\", \"replication\".",
-          "type": "string"
-        },
         "tls": {
           "$ref": "#/definitions/io.argoproj.common.TLSConfig",
           "description": "TLS configuration for the kafka client."
@@ -562,6 +558,10 @@
         "url": {
           "description": "URL to kafka cluster, multiple URLs separated by comma",
           "type": "string"
+        },
+        "version": {
+          "description": "Kafka version, sarama defaults to the oldest supported stable version",
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 37d9009a9c..7622753942 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -540,10 +540,6 @@
           "description": "SASL configuration for the kafka client",
           "$ref": "#/definitions/io.argoproj.common.SASLConfig"
         },
-        "streamConfig": {
-          "description": "Optional configuration for the kafka, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxRetry\", \"configVersion (sarama config version)\", \"requiredAcks\", \"replication\".",
-          "type": "string"
-        },
         "tls": {
           "description": "TLS configuration for the kafka client.",
           "$ref": "#/definitions/io.argoproj.common.TLSConfig"
@@ -555,6 +551,10 @@
         "url": {
           "description": "URL to kafka cluster, multiple URLs separated by comma",
           "type": "string"
+        },
+        "version": {
+          "description": "Kafka version, sarama defaults to the oldest supported stable version",
+          "type": "string"
         }
       }
     },
diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go
index f1659cb9f7..681d1b631e 100644
--- a/pkg/apis/eventbus/v1alpha1/generated.pb.go
+++ b/pkg/apis/eventbus/v1alpha1/generated.pb.go
@@ -493,135 +493,135 @@ func init() {
 }
 
 var fileDescriptor_871e47633eb7aad4 = []byte{
-	// 2045 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0x1b, 0xc7,
-	0x15, 0xd7, 0x52, 0x94, 0x44, 0x0e, 0xa9, 0x3f, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x41,
-	0x0a, 0x15, 0x89, 0x97, 0x75, 0x90, 0xb6, 0xae, 0x7b, 0x70, 0xb9, 0xb2, 0x62, 0xcb, 0x16, 0x65,
-	0x75, 0x28, 0x1b, 0x48, 0x1a, 0xd4, 0x1d, 0xad, 0x46, 0xd4, 0x4a, 0xfb, 0x87, 0xdd, 0x99, 0x65,
-	0xc5, 0x9e, 0x8a, 0xf6, 0xd0, 0x6b, 0x50, 0x14, 0x45, 0x3f, 0x40, 0x81, 0x02, 0xfd, 0x00, 0xfd,
-	0x06, 0x45, 0x7d, 0x28, 0xd0, 0x5c, 0x8a, 0xe6, 0x44, 0xc4, 0x0c, 0xfa, 0x25, 0x7c, 0x2a, 0x66,
-	0x76, 0xf6, 0x0f, 0xb9, 0xab, 0x58, 0x32, 0xa9, 0x06, 0xb9, 0x71, 0xde, 0x7b, 0xf3, 0xfb, 0xbd,
-	0x79, 0xfb, 0xe6, 0xcd, 0x7b, 0x12, 0x78, 0xd8, 0x31, 0xd9, 0xb1, 0x7f, 0xa0, 0x19, 0xae, 0xdd,
-	0xc0, 0x5e, 0xc7, 0xed, 0x7a, 0xee, 0x89, 0xf8, 0x71, 0x93, 0xf4, 0x88, 0xc3, 0x68, 0xa3, 0x7b,
-	0xda, 0x69, 0xe0, 0xae, 0x49, 0x1b, 0x62, 0x7d, 0xe0, 0xd3, 0x46, 0xef, 0x16, 0xb6, 0xba, 0xc7,
-	0xf8, 0x56, 0xa3, 0x43, 0x1c, 0xe2, 0x61, 0x46, 0x0e, 0xb5, 0xae, 0xe7, 0x32, 0x17, 0xde, 0x89,
-	0xb1, 0xb4, 0x10, 0x4b, 0xfc, 0x78, 0x16, 0x60, 0x69, 0xdd, 0xd3, 0x8e, 0xc6, 0xb1, 0xb4, 0x10,
-	0x4b, 0x0b, 0xb1, 0xd6, 0xef, 0x5e, 0xd8, 0x0f, 0xc3, 0xb5, 0x6d, 0xd7, 0x19, 0x27, 0x5f, 0xbf,
-	0x99, 0x00, 0xe8, 0xb8, 0x1d, 0xb7, 0x21, 0xc4, 0x07, 0xfe, 0x91, 0x58, 0x89, 0x85, 0xf8, 0x25,
-	0xcd, 0xeb, 0xa7, 0xb7, 0xa9, 0x66, 0xba, 0x1c, 0xb2, 0x61, 0xb8, 0x1e, 0x69, 0xf4, 0x52, 0xe7,
-	0x59, 0xff, 0x20, 0xb6, 0xb1, 0xb1, 0x71, 0x6c, 0x3a, 0xc4, 0xeb, 0x87, 0x7e, 0x34, 0x3c, 0x42,
-	0x5d, 0xdf, 0x33, 0xc8, 0xa5, 0x76, 0xd1, 0x86, 0x4d, 0x18, 0xce, 0xe2, 0x6a, 0x9c, 0xb7, 0xcb,
-	0xf3, 0x1d, 0x66, 0xda, 0x69, 0x9a, 0xef, 0xbf, 0x6a, 0x03, 0x35, 0x8e, 0x89, 0x8d, 0xc7, 0xf7,
-	0xd5, 0xff, 0x9d, 0x03, 0x45, 0xdd, 0xa7, 0x9b, 0xae, 0x73, 0x64, 0x76, 0xe0, 0x21, 0xc8, 0x3b,
-	0x98, 0x51, 0x55, 0xb9, 0xa1, 0x6c, 0x94, 0xde, 0xff, 0x50, 0x7b, 0xfd, 0x2f, 0xa8, 0xed, 0x36,
-	0xf7, 0xdb, 0x01, 0xaa, 0x5e, 0x18, 0x0e, 0x6a, 0x79, 0xbe, 0x46, 0x02, 0x1d, 0x9e, 0x81, 0xe2,
-	0x09, 0x61, 0x94, 0x79, 0x04, 0xdb, 0x6a, 0x4e, 0x50, 0x3d, 0x9a, 0x84, 0xea, 0x21, 0x61, 0x6d,
-	0x01, 0x26, 0xf9, 0x16, 0x87, 0x83, 0x5a, 0x31, 0x12, 0xa2, 0x98, 0x0c, 0x1e, 0x83, 0xb9, 0x53,
-	0x7c, 0x74, 0x8a, 0xd5, 0x59, 0xc1, 0x7a, 0x7f, 0x12, 0xd6, 0x47, 0x1c, 0x48, 0x32, 0x16, 0x87,
-	0x83, 0xda, 0x9c, 0x10, 0xa0, 0x80, 0xa0, 0xfe, 0xb7, 0x1c, 0xa8, 0x6c, 0xba, 0x0e, 0xc3, 0xfc,
-	0x4b, 0xec, 0x13, 0xbb, 0x6b, 0x61, 0x46, 0xe0, 0x47, 0xa0, 0x18, 0x26, 0x4a, 0x18, 0xe4, 0x0d,
-	0x2d, 0xf8, 0x72, 0x9c, 0x46, 0xe3, 0xa9, 0xa7, 0xf5, 0x6e, 0x69, 0x48, 0x1a, 0x21, 0xf2, 0x0b,
-	0xdf, 0xf4, 0x88, 0xcd, 0x7d, 0xd1, 0x2b, 0xcf, 0x07, 0xb5, 0x19, 0x7e, 0xb4, 0x50, 0x4b, 0x51,
-	0x8c, 0x06, 0x0f, 0xc0, 0xb2, 0x69, 0xe3, 0x0e, 0xd9, 0xf3, 0x2d, 0x6b, 0xcf, 0xb5, 0x4c, 0xa3,
-	0x2f, 0x42, 0x5b, 0xd4, 0x6f, 0xcb, 0x6d, 0xcb, 0xdb, 0xa3, 0xea, 0x97, 0x83, 0xda, 0xf5, 0x74,
-	0xd6, 0x6b, 0xb1, 0x01, 0x1a, 0x07, 0xe4, 0x1c, 0x94, 0x18, 0xbe, 0x67, 0xb2, 0x3e, 0x3f, 0x1b,
-	0x39, 0x63, 0x32, 0x90, 0x6f, 0x67, 0x1d, 0xa2, 0x3d, 0x6a, 0xaa, 0xaf, 0x72, 0x27, 0xc6, 0x84,
-	0x68, 0x1c, 0xb0, 0xfe, 0xcf, 0x1c, 0x28, 0x6c, 0xf1, 0x60, 0xeb, 0x3e, 0x85, 0x3f, 0x07, 0x05,
-	0x7e, 0x43, 0x0e, 0x31, 0xc3, 0x32, 0x5c, 0xdf, 0x4d, 0x30, 0x45, 0x89, 0x1e, 0x7f, 0x26, 0x6e,
-	0xcd, 0xb9, 0x1f, 0x1f, 0x9c, 0x10, 0x83, 0xb5, 0x08, 0xc3, 0x3a, 0x94, 0xe7, 0x07, 0xb1, 0x0c,
-	0x45, 0xa8, 0xf0, 0x04, 0xe4, 0x69, 0x97, 0x18, 0x32, 0x0d, 0x1f, 0x4c, 0x92, 0x10, 0xa1, 0xd7,
-	0xed, 0x2e, 0x31, 0xf4, 0xb2, 0x64, 0xcd, 0xf3, 0x15, 0x12, 0x1c, 0xd0, 0x03, 0xf3, 0x94, 0x61,
-	0xe6, 0x53, 0x19, 0xb5, 0x87, 0x53, 0x61, 0x13, 0x88, 0xfa, 0x92, 0xe4, 0x9b, 0x0f, 0xd6, 0x48,
-	0x32, 0xd5, 0xff, 0xa3, 0x80, 0x72, 0x68, 0xba, 0x63, 0x52, 0x06, 0x3f, 0x49, 0x85, 0x54, 0xbb,
-	0x58, 0x48, 0xf9, 0x6e, 0x11, 0xd0, 0x15, 0x49, 0x55, 0x08, 0x25, 0x89, 0x70, 0x9a, 0x60, 0xce,
-	0x64, 0xc4, 0xa6, 0x6a, 0xee, 0xc6, 0xec, 0x46, 0xe9, 0xfd, 0x7b, 0xd3, 0x38, 0xa1, 0xbe, 0x28,
-	0x09, 0xe7, 0xb6, 0x39, 0x34, 0x0a, 0x18, 0xea, 0xff, 0xca, 0xc5, 0x27, 0xe3, 0x41, 0x86, 0x78,
-	0xa4, 0x78, 0x6d, 0x4e, 0x5a, 0xbc, 0x38, 0xf3, 0x78, 0xe5, 0xf2, 0xd3, 0x95, 0xeb, 0xc1, 0x54,
-	0x2a, 0x97, 0x38, 0xe6, 0xb9, 0x65, 0x8b, 0x8c, 0x96, 0xad, 0x7b, 0x13, 0x97, 0x2d, 0x4e, 0x97,
-	0xae, 0x59, 0x5f, 0x28, 0x60, 0x69, 0x34, 0xad, 0xe0, 0xb3, 0x28, 0x65, 0x83, 0xa8, 0xfe, 0xe0,
-	0xe2, 0xd4, 0xc1, 0xc3, 0xac, 0x7d, 0x75, 0x7e, 0x42, 0x1b, 0xcc, 0x1b, 0xa2, 0x86, 0xca, 0x70,
-	0x6e, 0x4d, 0x72, 0xb6, 0xe8, 0x21, 0x8b, 0xe9, 0x82, 0x35, 0x92, 0x24, 0xf5, 0xdf, 0x2e, 0x81,
-	0x72, 0x32, 0xe8, 0xf0, 0x3b, 0x60, 0xa1, 0x47, 0x3c, 0x6a, 0xba, 0x8e, 0x38, 0x61, 0x51, 0x5f,
-	0x96, 0x3b, 0x17, 0x9e, 0x06, 0x62, 0x14, 0xea, 0xe1, 0x06, 0x28, 0x78, 0xa4, 0x6b, 0x99, 0x06,
-	0xa6, 0xc2, 0xd9, 0x39, 0xbd, 0xcc, 0x6f, 0x01, 0x92, 0x32, 0x14, 0x69, 0xe1, 0xef, 0x15, 0x50,
-	0x31, 0xc6, 0x8b, 0xbf, 0xfc, 0x78, 0xad, 0x49, 0x0e, 0x98, 0x7a, 0x51, 0xf4, 0x37, 0x86, 0x83,
-	0x5a, 0xfa, 0xa1, 0x41, 0x69, 0x7a, 0xf8, 0x57, 0x05, 0x5c, 0xf3, 0x88, 0xe5, 0xe2, 0x43, 0xe2,
-	0xa5, 0x36, 0xa8, 0xf9, 0xab, 0x70, 0xee, 0xfa, 0x70, 0x50, 0xbb, 0x86, 0xce, 0xe3, 0x44, 0xe7,
-	0xbb, 0x03, 0xff, 0xa2, 0x00, 0xd5, 0x26, 0xcc, 0x33, 0x0d, 0x9a, 0xf6, 0x75, 0xee, 0x2a, 0x7c,
-	0x7d, 0x6b, 0x38, 0xa8, 0xa9, 0xad, 0x73, 0x28, 0xd1, 0xb9, 0xce, 0xc0, 0xdf, 0x28, 0xa0, 0xd4,
-	0xe5, 0x19, 0x42, 0x19, 0x71, 0x0c, 0xa2, 0xce, 0x0b, 0xe7, 0x1e, 0x4f, 0xe2, 0xdc, 0x5e, 0x0c,
-	0xd7, 0x66, 0xbc, 0x59, 0xeb, 0xf4, 0xf5, 0xe5, 0xe1, 0xa0, 0x56, 0x4a, 0x28, 0x50, 0x92, 0x14,
-	0x1a, 0x89, 0xa2, 0xbe, 0x20, 0x1c, 0xf8, 0xe1, 0xa5, 0x2f, 0x6a, 0x4b, 0x02, 0x04, 0x59, 0x1d,
-	0xae, 0x12, 0xb5, 0xfd, 0x0f, 0x0a, 0x28, 0x3b, 0xee, 0x21, 0x69, 0x13, 0x8b, 0x18, 0xcc, 0xf5,
-	0xd4, 0x82, 0xa8, 0xf1, 0x1f, 0x4f, 0xab, 0x00, 0x6a, 0xbb, 0x09, 0xf0, 0x2d, 0x87, 0x79, 0x7d,
-	0x7d, 0x4d, 0x5e, 0xc6, 0x72, 0x52, 0x85, 0x46, 0xbc, 0x80, 0x4f, 0x40, 0x89, 0xb9, 0x16, 0x6f,
-	0x6a, 0x4d, 0xd7, 0xa1, 0x6a, 0x51, 0x38, 0x55, 0xcd, 0x6a, 0x48, 0xf6, 0x23, 0x33, 0x7d, 0x55,
-	0x02, 0x97, 0x62, 0x19, 0x45, 0x49, 0x1c, 0x48, 0xd2, 0xbd, 0x0e, 0x10, 0x91, 0xfd, 0x76, 0x16,
-	0xf4, 0x9e, 0x7b, 0xf8, 0x5a, 0xed, 0x0e, 0x74, 0xc0, 0x4a, 0xd4, 0x65, 0xb5, 0x89, 0xe1, 0x11,
-	0x46, 0xd5, 0x92, 0x38, 0x42, 0x66, 0x63, 0xb8, 0xe3, 0x1a, 0xd8, 0x0a, 0x1a, 0x19, 0x44, 0x8e,
-	0x88, 0xc7, 0xbf, 0xbe, 0xae, 0xca, 0xc3, 0xac, 0x6c, 0x8f, 0x21, 0xa1, 0x14, 0x36, 0xbc, 0x0f,
-	0x2a, 0x5d, 0xcf, 0x74, 0x85, 0x0b, 0x16, 0xa6, 0x74, 0x17, 0xdb, 0x44, 0x2d, 0x8b, 0xca, 0x77,
-	0x4d, 0xc2, 0x54, 0xf6, 0xc6, 0x0d, 0x50, 0x7a, 0x0f, 0xaf, 0x86, 0xa1, 0x50, 0x5d, 0x8c, 0xab,
-	0x61, 0xb8, 0x17, 0x45, 0x5a, 0xf8, 0x21, 0x28, 0xe0, 0xa3, 0x23, 0xd3, 0xe1, 0x96, 0x4b, 0x22,
-	0x84, 0x6f, 0x65, 0x1d, 0xad, 0x29, 0x6d, 0x02, 0x9c, 0x70, 0x85, 0xa2, 0xbd, 0xf0, 0x21, 0x80,
-	0x94, 0x78, 0x3d, 0xd3, 0x20, 0x4d, 0xc3, 0x70, 0x7d, 0x87, 0x09, 0xdf, 0x97, 0x85, 0xef, 0xeb,
-	0xd2, 0x77, 0xd8, 0x4e, 0x59, 0xa0, 0x8c, 0x5d, 0xdc, 0x7b, 0x4a, 0x18, 0x33, 0x9d, 0x0e, 0x55,
-	0x57, 0x04, 0x82, 0x60, 0x6d, 0x4b, 0x19, 0x8a, 0xb4, 0xf0, 0x5d, 0x50, 0xa4, 0x0c, 0x7b, 0xac,
-	0xe9, 0x75, 0xa8, 0x5a, 0xb9, 0x31, 0xbb, 0x51, 0x0c, 0x1e, 0xea, 0x76, 0x28, 0x44, 0xb1, 0x1e,
-	0x7e, 0x00, 0xca, 0x34, 0x31, 0x89, 0xa8, 0x50, 0x40, 0xaf, 0xf0, 0x0c, 0x4e, 0x4e, 0x28, 0x68,
-	0xc4, 0x0a, 0x6a, 0x00, 0xd8, 0xf8, 0x6c, 0x0f, 0xf7, 0x79, 0x35, 0x54, 0x57, 0xc5, 0x9e, 0x25,
-	0xde, 0xb1, 0xb6, 0x22, 0x29, 0x4a, 0x58, 0xac, 0xdf, 0x05, 0x95, 0xd4, 0x55, 0x81, 0x2b, 0x60,
-	0xf6, 0x94, 0xf4, 0x83, 0x47, 0x0c, 0xf1, 0x9f, 0x70, 0x0d, 0xcc, 0xf5, 0xb0, 0xe5, 0x93, 0x60,
-	0x0e, 0x40, 0xc1, 0xe2, 0x4e, 0xee, 0xb6, 0x52, 0xff, 0x87, 0x02, 0x96, 0xc7, 0x86, 0x26, 0x78,
-	0x1d, 0xcc, 0xfa, 0x9e, 0x25, 0x1f, 0xc1, 0x92, 0x0c, 0xe7, 0xec, 0x13, 0xb4, 0x83, 0xb8, 0x1c,
-	0xfe, 0x14, 0x94, 0xb1, 0x61, 0x10, 0x4a, 0x83, 0x44, 0x92, 0xaf, 0xf5, 0x3b, 0xe7, 0xf4, 0xfd,
-	0x1e, 0x61, 0x8f, 0x48, 0x3f, 0x74, 0x30, 0x08, 0x40, 0x33, 0xb1, 0x1d, 0x8d, 0x80, 0xc1, 0xdb,
-	0x63, 0x61, 0x9b, 0x15, 0x4e, 0x44, 0x97, 0xff, 0xfc, 0xd0, 0xd5, 0x7f, 0x09, 0x0a, 0x61, 0x43,
-	0x03, 0x4f, 0xc1, 0x3c, 0x39, 0x73, 0x99, 0x69, 0xc8, 0x5e, 0x65, 0x6a, 0xd3, 0x1d, 0xe0, 0x8d,
-	0xc4, 0x96, 0x80, 0x46, 0x92, 0xa2, 0xfe, 0xe7, 0x3c, 0x28, 0x25, 0x6c, 0x5e, 0x15, 0xbe, 0xb7,
-	0xc1, 0x1c, 0x73, 0xbb, 0xa6, 0x21, 0x67, 0xb2, 0xa8, 0xa3, 0xdd, 0xe7, 0x42, 0x14, 0xe8, 0xe0,
-	0x13, 0x30, 0xcb, 0xac, 0x70, 0x38, 0xb8, 0x73, 0xe9, 0x02, 0xbe, 0xbf, 0x13, 0x0e, 0xdc, 0x0b,
-	0x9c, 0x7b, 0x7f, 0xa7, 0x8d, 0x38, 0x1e, 0xfc, 0x08, 0xe4, 0x29, 0xa6, 0x96, 0x7c, 0xe2, 0x7f,
-	0x74, 0xf9, 0x0e, 0xae, 0xd9, 0xde, 0x49, 0x4e, 0xf2, 0x7c, 0x8d, 0x04, 0x24, 0xfc, 0x9d, 0x02,
-	0x16, 0x0d, 0xd7, 0xa1, 0xbe, 0x4d, 0xbc, 0xfb, 0x9e, 0xeb, 0x77, 0xe5, 0xdb, 0xbc, 0x3b, 0x8d,
-	0xd0, 0xc7, 0xa8, 0x7a, 0x65, 0x38, 0xa8, 0x2d, 0x8e, 0x88, 0xd0, 0x28, 0x6f, 0x2a, 0x3f, 0xe7,
-	0xaf, 0x32, 0x3f, 0x17, 0x2e, 0x9c, 0x9f, 0x7f, 0x57, 0x00, 0x4c, 0x9f, 0x07, 0x36, 0x40, 0xb1,
-	0xc3, 0x7f, 0x88, 0x0a, 0x16, 0xe4, 0x4c, 0x34, 0xdd, 0xdf, 0x0f, 0x15, 0x28, 0xb6, 0xe1, 0x65,
-	0xdb, 0x23, 0x07, 0xd8, 0xc2, 0x89, 0x9e, 0x40, 0xe6, 0x52, 0x54, 0xb6, 0xd1, 0xb8, 0x01, 0x4a,
-	0xef, 0x81, 0xdf, 0x03, 0x25, 0x51, 0xae, 0x1e, 0x5b, 0x87, 0x84, 0x06, 0xe3, 0x7b, 0x21, 0x7e,
-	0x0d, 0xdb, 0xb1, 0x0a, 0x25, 0xed, 0xea, 0xff, 0x55, 0xc0, 0x82, 0x1c, 0x8a, 0xa0, 0x03, 0xe6,
-	0x1d, 0xcc, 0xcc, 0x1e, 0x91, 0xf7, 0x6c, 0xa2, 0x31, 0x76, 0x57, 0x20, 0x45, 0x6d, 0x8e, 0xb8,
-	0x6a, 0x81, 0x0c, 0x49, 0x16, 0x78, 0x12, 0xdd, 0xeb, 0xdc, 0x54, 0xff, 0x2c, 0x95, 0x75, 0xad,
-	0xbf, 0x54, 0x00, 0x88, 0x4d, 0x5e, 0x75, 0xab, 0xdf, 0x05, 0x45, 0xc3, 0xf2, 0x29, 0x23, 0xde,
-	0xf6, 0xbd, 0xf0, 0x66, 0xf3, 0x4f, 0xb8, 0x19, 0x0a, 0x51, 0xac, 0x87, 0xef, 0x81, 0x3c, 0xf6,
-	0xd9, 0xb1, 0x2c, 0x6e, 0x2a, 0xbf, 0x49, 0x4d, 0x9f, 0x1d, 0xbf, 0xe4, 0xa9, 0xe7, 0xb3, 0xe3,
-	0xe8, 0xa3, 0x09, 0xab, 0x54, 0x3e, 0xe7, 0xa7, 0x98, 0xcf, 0xf5, 0x4f, 0x97, 0xc1, 0xd2, 0x68,
-	0xe0, 0xe1, 0x7b, 0x89, 0xe1, 0x46, 0x11, 0xcf, 0x79, 0x34, 0xe6, 0x67, 0x0c, 0x38, 0xe1, 0x59,
-	0x72, 0x17, 0x3a, 0xcb, 0x78, 0x8b, 0x3c, 0xfb, 0x75, 0xb4, 0xc8, 0xd9, 0x33, 0x59, 0xfe, 0xeb,
-	0x9d, 0xc9, 0xbe, 0x39, 0x63, 0xce, 0x1f, 0xc7, 0x9b, 0xff, 0x79, 0xd1, 0xa4, 0x7e, 0x32, 0xbd,
-	0xbb, 0x3f, 0x9d, 0xf6, 0x7f, 0x61, 0x4a, 0xed, 0x7f, 0x72, 0xa2, 0x2a, 0x5c, 0xd5, 0x44, 0x95,
-	0x31, 0x63, 0x14, 0xaf, 0x60, 0xc6, 0xa8, 0x83, 0x79, 0x1b, 0x9f, 0x35, 0x3b, 0x44, 0x4c, 0x30,
-	0xc5, 0xa0, 0xf0, 0xb5, 0x84, 0x04, 0x49, 0xcd, 0xff, 0x7d, 0x0e, 0xc9, 0x6e, 0xe6, 0xcb, 0xaf,
-	0xd5, 0xcc, 0x67, 0xce, 0x34, 0x8b, 0x13, 0xce, 0x34, 0x4b, 0x17, 0x9e, 0x69, 0x96, 0x27, 0x98,
-	0x69, 0xde, 0x01, 0x0b, 0x36, 0x3e, 0x6b, 0x51, 0x39, 0x86, 0xe4, 0xf5, 0xd2, 0x70, 0x50, 0x5b,
-	0x68, 0x05, 0x22, 0x14, 0xea, 0xb8, 0x63, 0x36, 0x3e, 0xd3, 0xfb, 0x8c, 0xf0, 0x19, 0x24, 0x1a,
-	0x57, 0x5a, 0x52, 0x86, 0x22, 0xad, 0x04, 0x6c, 0xfb, 0x07, 0x54, 0x0c, 0x1f, 0x31, 0x20, 0x17,
-	0xa1, 0x50, 0x77, 0xd9, 0x91, 0x03, 0xee, 0x80, 0x35, 0x0f, 0x1f, 0xb1, 0x07, 0x04, 0x7b, 0xec,
-	0x80, 0x60, 0xb6, 0x6f, 0xda, 0xc4, 0xf5, 0x99, 0xba, 0x16, 0x3d, 0x00, 0x6b, 0x28, 0x43, 0x8f,
-	0x32, 0x77, 0xc1, 0x6d, 0xb0, 0xca, 0xe5, 0x5b, 0xfc, 0x0a, 0x9b, 0xae, 0x13, 0x82, 0xbd, 0x21,
-	0xc0, 0xde, 0x1c, 0x0e, 0x6a, 0xab, 0x28, 0xad, 0x46, 0x59, 0x7b, 0xe0, 0x8f, 0xc1, 0x0a, 0x17,
-	0xef, 0x10, 0x4c, 0x49, 0x88, 0xf3, 0xad, 0xa0, 0x3d, 0xe3, 0x99, 0x88, 0xc6, 0x74, 0x28, 0x65,
-	0x0d, 0x37, 0x41, 0x85, 0xcb, 0x36, 0x5d, 0xdb, 0x36, 0xa3, 0x73, 0xbd, 0x29, 0x20, 0x44, 0x21,
-	0x47, 0xe3, 0x4a, 0x94, 0xb6, 0x9f, 0x7c, 0x24, 0xfb, 0x53, 0x0e, 0xac, 0x66, 0x3c, 0x6a, 0xfc,
-	0x7c, 0x94, 0xb9, 0x1e, 0xee, 0x90, 0x38, 0xb5, 0x95, 0xf8, 0x7c, 0xed, 0x31, 0x1d, 0x4a, 0x59,
-	0xc3, 0x67, 0x00, 0x04, 0x8f, 0x7f, 0xcb, 0x3d, 0x94, 0xc4, 0xfa, 0x5d, 0xfe, 0xa9, 0x9b, 0x91,
-	0xf4, 0xe5, 0xa0, 0x76, 0x33, 0xeb, 0x5f, 0x41, 0xa1, 0x3f, 0xec, 0xa9, 0x6b, 0xf9, 0x36, 0x89,
-	0x37, 0xa0, 0x04, 0x24, 0xfc, 0x19, 0x00, 0x3d, 0xa1, 0x6f, 0x9b, 0xbf, 0x0a, 0x1f, 0xf7, 0xaf,
-	0xfc, 0x9f, 0x82, 0x16, 0xfe, 0xd7, 0x4a, 0xfb, 0x89, 0x8f, 0x1d, 0xc6, 0xef, 0x87, 0xc8, 0xbd,
-	0xa7, 0x11, 0x0a, 0x4a, 0x20, 0xea, 0xda, 0xf3, 0x17, 0xd5, 0x99, 0xcf, 0x5e, 0x54, 0x67, 0x3e,
-	0x7f, 0x51, 0x9d, 0xf9, 0xf5, 0xb0, 0xaa, 0x3c, 0x1f, 0x56, 0x95, 0xcf, 0x86, 0x55, 0xe5, 0xf3,
-	0x61, 0x55, 0xf9, 0x62, 0x58, 0x55, 0x3e, 0xfd, 0xb2, 0x3a, 0xf3, 0x71, 0x21, 0x7c, 0x56, 0xfe,
-	0x17, 0x00, 0x00, 0xff, 0xff, 0xff, 0x4b, 0x9b, 0xaf, 0xc4, 0x1e, 0x00, 0x00,
+	// 2044 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x5b, 0x6f, 0x1b, 0xc7,
+	0x15, 0xf6, 0x92, 0x94, 0x44, 0x0e, 0xa9, 0x0b, 0x47, 0x4a, 0xb3, 0x16, 0x62, 0xd2, 0x60, 0x90,
+	0x42, 0x45, 0xe2, 0x65, 0x1d, 0xa4, 0xad, 0xeb, 0x3e, 0xb8, 0x5c, 0x59, 0xb1, 0x65, 0x8b, 0xb2,
+	0x3a, 0x94, 0x0d, 0x24, 0x0d, 0xea, 0x8e, 0x56, 0x23, 0x6a, 0xa5, 0xbd, 0xb0, 0x3b, 0xb3, 0xac,
+	0xd8, 0xa7, 0xa2, 0x7d, 0xe8, 0x6b, 0x50, 0xb4, 0x45, 0xff, 0x41, 0x81, 0xfe, 0x80, 0xfe, 0x83,
+	0xa2, 0x7e, 0x28, 0xd0, 0xbc, 0x14, 0xcd, 0x13, 0x11, 0x33, 0xe8, 0x9f, 0xf0, 0x53, 0x31, 0xb3,
+	0xb3, 0x17, 0x72, 0x57, 0xb1, 0x64, 0xd2, 0x0d, 0xf2, 0xc6, 0x39, 0xe7, 0xcc, 0x77, 0x2e, 0x7b,
+	0xe6, 0x5c, 0x24, 0xf0, 0xa0, 0x6b, 0xb2, 0x63, 0xff, 0x40, 0x33, 0x5c, 0xbb, 0x89, 0xbd, 0xae,
+	0xdb, 0xf3, 0xdc, 0x13, 0xf1, 0xe3, 0x06, 0xe9, 0x13, 0x87, 0xd1, 0x66, 0xef, 0xb4, 0xdb, 0xc4,
+	0x3d, 0x93, 0x36, 0xc5, 0xf9, 0xc0, 0xa7, 0xcd, 0xfe, 0x4d, 0x6c, 0xf5, 0x8e, 0xf1, 0xcd, 0x66,
+	0x97, 0x38, 0xc4, 0xc3, 0x8c, 0x1c, 0x6a, 0x3d, 0xcf, 0x65, 0x2e, 0xbc, 0x1d, 0x63, 0x69, 0x21,
+	0x96, 0xf8, 0xf1, 0x34, 0xc0, 0xd2, 0x7a, 0xa7, 0x5d, 0x8d, 0x63, 0x69, 0x21, 0x96, 0x16, 0x62,
+	0xad, 0xdf, 0xb9, 0xb0, 0x1d, 0x86, 0x6b, 0xdb, 0xae, 0x33, 0xa9, 0x7c, 0xfd, 0x46, 0x02, 0xa0,
+	0xeb, 0x76, 0xdd, 0xa6, 0x20, 0x1f, 0xf8, 0x47, 0xe2, 0x24, 0x0e, 0xe2, 0x97, 0x14, 0x6f, 0x9c,
+	0xde, 0xa2, 0x9a, 0xe9, 0x72, 0xc8, 0xa6, 0xe1, 0x7a, 0xa4, 0xd9, 0x4f, 0xf9, 0xb3, 0xfe, 0x41,
+	0x2c, 0x63, 0x63, 0xe3, 0xd8, 0x74, 0x88, 0x37, 0x08, 0xed, 0x68, 0x7a, 0x84, 0xba, 0xbe, 0x67,
+	0x90, 0x4b, 0xdd, 0xa2, 0x4d, 0x9b, 0x30, 0x9c, 0xa5, 0xab, 0x79, 0xde, 0x2d, 0xcf, 0x77, 0x98,
+	0x69, 0xa7, 0xd5, 0x7c, 0xff, 0x65, 0x17, 0xa8, 0x71, 0x4c, 0x6c, 0x3c, 0x79, 0xaf, 0xf1, 0xef,
+	0x1c, 0x28, 0xe9, 0x3e, 0xdd, 0x74, 0x9d, 0x23, 0xb3, 0x0b, 0x0f, 0x41, 0xc1, 0xc1, 0x8c, 0xaa,
+	0xca, 0x75, 0x65, 0xa3, 0xfc, 0xfe, 0x87, 0xda, 0xab, 0x7f, 0x41, 0x6d, 0xb7, 0xb5, 0xdf, 0x09,
+	0x50, 0xf5, 0xe2, 0x68, 0x58, 0x2f, 0xf0, 0x33, 0x12, 0xe8, 0xf0, 0x0c, 0x94, 0x4e, 0x08, 0xa3,
+	0xcc, 0x23, 0xd8, 0x56, 0x73, 0x42, 0xd5, 0xc3, 0x69, 0x54, 0x3d, 0x20, 0xac, 0x23, 0xc0, 0xa4,
+	0xbe, 0xc5, 0xd1, 0xb0, 0x5e, 0x8a, 0x88, 0x28, 0x56, 0x06, 0x8f, 0xc1, 0xdc, 0x29, 0x3e, 0x3a,
+	0xc5, 0x6a, 0x5e, 0x68, 0xbd, 0x37, 0x8d, 0xd6, 0x87, 0x1c, 0x48, 0x6a, 0x2c, 0x8d, 0x86, 0xf5,
+	0x39, 0x41, 0x40, 0x81, 0x82, 0xc6, 0xdf, 0x72, 0xa0, 0xba, 0xe9, 0x3a, 0x0c, 0xf3, 0x2f, 0xb1,
+	0x4f, 0xec, 0x9e, 0x85, 0x19, 0x81, 0x1f, 0x81, 0x52, 0x98, 0x28, 0x61, 0x90, 0x37, 0xb4, 0xe0,
+	0xcb, 0x71, 0x35, 0x1a, 0x4f, 0x3d, 0xad, 0x7f, 0x53, 0x43, 0x52, 0x08, 0x91, 0x5f, 0xf8, 0xa6,
+	0x47, 0x6c, 0x6e, 0x8b, 0x5e, 0x7d, 0x36, 0xac, 0x5f, 0xe1, 0xae, 0x85, 0x5c, 0x8a, 0x62, 0x34,
+	0x78, 0x00, 0x96, 0x4d, 0x1b, 0x77, 0xc9, 0x9e, 0x6f, 0x59, 0x7b, 0xae, 0x65, 0x1a, 0x03, 0x11,
+	0xda, 0x92, 0x7e, 0x4b, 0x5e, 0x5b, 0xde, 0x1e, 0x67, 0xbf, 0x18, 0xd6, 0xaf, 0xa5, 0xb3, 0x5e,
+	0x8b, 0x05, 0xd0, 0x24, 0x20, 0xd7, 0x41, 0x89, 0xe1, 0x7b, 0x26, 0x1b, 0x70, 0xdf, 0xc8, 0x19,
+	0x93, 0x81, 0x7c, 0x3b, 0xcb, 0x89, 0xce, 0xb8, 0xa8, 0xbe, 0xca, 0x8d, 0x98, 0x20, 0xa2, 0x49,
+	0xc0, 0xc6, 0x3f, 0x73, 0xa0, 0xb8, 0xc5, 0x83, 0xad, 0xfb, 0x14, 0xfe, 0x1c, 0x14, 0xf9, 0x0b,
+	0x39, 0xc4, 0x0c, 0xcb, 0x70, 0x7d, 0x37, 0xa1, 0x29, 0x4a, 0xf4, 0xf8, 0x33, 0x71, 0x69, 0xae,
+	0xfb, 0xd1, 0xc1, 0x09, 0x31, 0x58, 0x9b, 0x30, 0xac, 0x43, 0xe9, 0x3f, 0x88, 0x69, 0x28, 0x42,
+	0x85, 0x27, 0xa0, 0x40, 0x7b, 0xc4, 0x90, 0x69, 0x78, 0x7f, 0x9a, 0x84, 0x08, 0xad, 0xee, 0xf4,
+	0x88, 0xa1, 0x57, 0xa4, 0xd6, 0x02, 0x3f, 0x21, 0xa1, 0x03, 0x7a, 0x60, 0x9e, 0x32, 0xcc, 0x7c,
+	0x2a, 0xa3, 0xf6, 0x60, 0x26, 0xda, 0x04, 0xa2, 0xbe, 0x24, 0xf5, 0xcd, 0x07, 0x67, 0x24, 0x35,
+	0x35, 0xfe, 0xa3, 0x80, 0x4a, 0x28, 0xba, 0x63, 0x52, 0x06, 0x3f, 0x49, 0x85, 0x54, 0xbb, 0x58,
+	0x48, 0xf9, 0x6d, 0x11, 0xd0, 0x15, 0xa9, 0xaa, 0x18, 0x52, 0x12, 0xe1, 0x34, 0xc1, 0x9c, 0xc9,
+	0x88, 0x4d, 0xd5, 0xdc, 0xf5, 0xfc, 0x46, 0xf9, 0xfd, 0xbb, 0xb3, 0xf0, 0x50, 0x5f, 0x94, 0x0a,
+	0xe7, 0xb6, 0x39, 0x34, 0x0a, 0x34, 0x34, 0xfe, 0x95, 0x8b, 0x3d, 0xe3, 0x41, 0x86, 0x78, 0xac,
+	0x78, 0x6d, 0x4e, 0x5b, 0xbc, 0xb8, 0xe6, 0xc9, 0xca, 0xe5, 0xa7, 0x2b, 0xd7, 0xfd, 0x99, 0x54,
+	0x2e, 0xe1, 0xe6, 0xb9, 0x65, 0x8b, 0x8c, 0x97, 0xad, 0xbb, 0x53, 0x97, 0x2d, 0xae, 0x2e, 0x5d,
+	0xb3, 0xbe, 0x50, 0xc0, 0xd2, 0x78, 0x5a, 0xc1, 0xa7, 0x51, 0xca, 0x06, 0x51, 0xfd, 0xc1, 0xc5,
+	0x55, 0x07, 0x8d, 0x59, 0xfb, 0xea, 0xfc, 0x84, 0x36, 0x98, 0x37, 0x44, 0x0d, 0x95, 0xe1, 0xdc,
+	0x9a, 0xc6, 0xb7, 0xa8, 0x91, 0xc5, 0xea, 0x82, 0x33, 0x92, 0x4a, 0x1a, 0xbf, 0x5d, 0x02, 0x95,
+	0x64, 0xd0, 0xe1, 0x77, 0xc0, 0x42, 0x9f, 0x78, 0xd4, 0x74, 0x1d, 0xe1, 0x61, 0x49, 0x5f, 0x96,
+	0x37, 0x17, 0x9e, 0x04, 0x64, 0x14, 0xf2, 0xe1, 0x06, 0x28, 0x7a, 0xa4, 0x67, 0x99, 0x06, 0xa6,
+	0xc2, 0xd8, 0x39, 0xbd, 0xc2, 0x5f, 0x01, 0x92, 0x34, 0x14, 0x71, 0xe1, 0xef, 0x15, 0x50, 0x35,
+	0x26, 0x8b, 0xbf, 0xfc, 0x78, 0xed, 0x69, 0x1c, 0x4c, 0x75, 0x14, 0xfd, 0x8d, 0xd1, 0xb0, 0x9e,
+	0x6e, 0x34, 0x28, 0xad, 0x1e, 0xfe, 0x55, 0x01, 0x57, 0x3d, 0x62, 0xb9, 0xf8, 0x90, 0x78, 0xa9,
+	0x0b, 0x6a, 0xe1, 0x75, 0x18, 0x77, 0x6d, 0x34, 0xac, 0x5f, 0x45, 0xe7, 0xe9, 0x44, 0xe7, 0x9b,
+	0x03, 0xff, 0xa2, 0x00, 0xd5, 0x26, 0xcc, 0x33, 0x0d, 0x9a, 0xb6, 0x75, 0xee, 0x75, 0xd8, 0xfa,
+	0xd6, 0x68, 0x58, 0x57, 0xdb, 0xe7, 0xa8, 0x44, 0xe7, 0x1a, 0x03, 0x7f, 0xa3, 0x80, 0x72, 0x8f,
+	0x67, 0x08, 0x65, 0xc4, 0x31, 0x88, 0x3a, 0x2f, 0x8c, 0x7b, 0x34, 0x8d, 0x71, 0x7b, 0x31, 0x5c,
+	0x87, 0xf1, 0x61, 0xad, 0x3b, 0xd0, 0x97, 0x47, 0xc3, 0x7a, 0x39, 0xc1, 0x40, 0x49, 0xa5, 0xd0,
+	0x48, 0x14, 0xf5, 0x05, 0x61, 0xc0, 0x0f, 0x2f, 0xfd, 0x50, 0xdb, 0x12, 0x20, 0xc8, 0xea, 0xf0,
+	0x94, 0xa8, 0xed, 0x7f, 0x50, 0x40, 0xc5, 0x71, 0x0f, 0x49, 0x87, 0x58, 0xc4, 0x60, 0xae, 0xa7,
+	0x16, 0x45, 0x8d, 0xff, 0x78, 0x56, 0x05, 0x50, 0xdb, 0x4d, 0x80, 0x6f, 0x39, 0xcc, 0x1b, 0xe8,
+	0x6b, 0xf2, 0x31, 0x56, 0x92, 0x2c, 0x34, 0x66, 0x05, 0x7c, 0x0c, 0xca, 0xcc, 0xb5, 0xf8, 0x50,
+	0x6b, 0xba, 0x0e, 0x55, 0x4b, 0xc2, 0xa8, 0x5a, 0xd6, 0x40, 0xb2, 0x1f, 0x89, 0xe9, 0xab, 0x12,
+	0xb8, 0x1c, 0xd3, 0x28, 0x4a, 0xe2, 0x40, 0x92, 0x9e, 0x75, 0x80, 0x88, 0xec, 0xb7, 0xb3, 0xa0,
+	0xf7, 0xdc, 0xc3, 0x57, 0x1a, 0x77, 0xa0, 0x03, 0x56, 0xa2, 0x29, 0xab, 0x43, 0x0c, 0x8f, 0x30,
+	0xaa, 0x96, 0x85, 0x0b, 0x99, 0x83, 0xe1, 0x8e, 0x6b, 0x60, 0x2b, 0x18, 0x64, 0x10, 0x39, 0x22,
+	0x1e, 0xff, 0xfa, 0xba, 0x2a, 0x9d, 0x59, 0xd9, 0x9e, 0x40, 0x42, 0x29, 0x6c, 0x78, 0x0f, 0x54,
+	0x7b, 0x9e, 0xe9, 0x0a, 0x13, 0x2c, 0x4c, 0xe9, 0x2e, 0xb6, 0x89, 0x5a, 0x11, 0x95, 0xef, 0xaa,
+	0x84, 0xa9, 0xee, 0x4d, 0x0a, 0xa0, 0xf4, 0x1d, 0x5e, 0x0d, 0x43, 0xa2, 0xba, 0x18, 0x57, 0xc3,
+	0xf0, 0x2e, 0x8a, 0xb8, 0xf0, 0x43, 0x50, 0xc4, 0x47, 0x47, 0xa6, 0xc3, 0x25, 0x97, 0x44, 0x08,
+	0xdf, 0xca, 0x72, 0xad, 0x25, 0x65, 0x02, 0x9c, 0xf0, 0x84, 0xa2, 0xbb, 0xf0, 0x01, 0x80, 0x94,
+	0x78, 0x7d, 0xd3, 0x20, 0x2d, 0xc3, 0x70, 0x7d, 0x87, 0x09, 0xdb, 0x97, 0x85, 0xed, 0xeb, 0xd2,
+	0x76, 0xd8, 0x49, 0x49, 0xa0, 0x8c, 0x5b, 0xdc, 0x7a, 0x4a, 0x18, 0x33, 0x9d, 0x2e, 0x55, 0x57,
+	0x04, 0x82, 0xd0, 0xda, 0x91, 0x34, 0x14, 0x71, 0xe1, 0xbb, 0xa0, 0x44, 0x19, 0xf6, 0x58, 0xcb,
+	0xeb, 0x52, 0xb5, 0x7a, 0x3d, 0xbf, 0x51, 0x0a, 0x1a, 0x75, 0x27, 0x24, 0xa2, 0x98, 0x0f, 0x3f,
+	0x00, 0x15, 0x9a, 0xd8, 0x44, 0x54, 0x28, 0xa0, 0x57, 0x78, 0x06, 0x27, 0x37, 0x14, 0x34, 0x26,
+	0x05, 0x35, 0x00, 0x6c, 0x7c, 0xb6, 0x87, 0x07, 0xbc, 0x1a, 0xaa, 0xab, 0xe2, 0xce, 0x12, 0x9f,
+	0x58, 0xdb, 0x11, 0x15, 0x25, 0x24, 0xd6, 0xef, 0x80, 0x6a, 0xea, 0xa9, 0xc0, 0x15, 0x90, 0x3f,
+	0x25, 0x83, 0xa0, 0x89, 0x21, 0xfe, 0x13, 0xae, 0x81, 0xb9, 0x3e, 0xb6, 0x7c, 0x12, 0xec, 0x01,
+	0x28, 0x38, 0xdc, 0xce, 0xdd, 0x52, 0x1a, 0xff, 0x50, 0xc0, 0xf2, 0xc4, 0xd2, 0x04, 0xaf, 0x81,
+	0xbc, 0xef, 0x59, 0xb2, 0x09, 0x96, 0x65, 0x38, 0xf3, 0x8f, 0xd1, 0x0e, 0xe2, 0x74, 0xf8, 0x53,
+	0x50, 0xc1, 0x86, 0x41, 0x28, 0x0d, 0x12, 0x49, 0x76, 0xeb, 0x77, 0xce, 0x99, 0xfb, 0x3d, 0xc2,
+	0x1e, 0x92, 0x41, 0x68, 0x60, 0x10, 0x80, 0x56, 0xe2, 0x3a, 0x1a, 0x03, 0x83, 0xb7, 0x26, 0xc2,
+	0x96, 0x17, 0x46, 0x44, 0x8f, 0xff, 0xfc, 0xd0, 0x35, 0x7e, 0x09, 0x8a, 0xe1, 0x40, 0x03, 0x4f,
+	0xc1, 0x3c, 0x39, 0x73, 0x99, 0x69, 0xc8, 0x59, 0x65, 0x66, 0xdb, 0x1d, 0xe0, 0x83, 0xc4, 0x96,
+	0x80, 0x46, 0x52, 0x45, 0xe3, 0x8f, 0x05, 0x50, 0x4e, 0xc8, 0xbc, 0x2c, 0x7c, 0x89, 0x31, 0x23,
+	0xf7, 0x92, 0x31, 0xe3, 0x6d, 0x30, 0xc7, 0xdc, 0x9e, 0x69, 0xc8, 0x28, 0x44, 0xc3, 0xef, 0x3e,
+	0x27, 0xa2, 0x80, 0x07, 0x1f, 0x83, 0x3c, 0xb3, 0xa8, 0xec, 0xda, 0xb7, 0x2f, 0x5d, 0xeb, 0xf7,
+	0x77, 0xc2, 0xdd, 0x7c, 0x81, 0x9b, 0xb9, 0xbf, 0xd3, 0x41, 0x1c, 0x0f, 0x7e, 0x04, 0x0a, 0x14,
+	0x53, 0x4b, 0x76, 0xd8, 0x1f, 0x5d, 0x7e, 0xd8, 0x6b, 0x75, 0x76, 0x92, 0x4b, 0x3f, 0x3f, 0x23,
+	0x01, 0x09, 0x7f, 0xa7, 0x80, 0x45, 0xc3, 0x75, 0xa8, 0x6f, 0x13, 0xef, 0x9e, 0xe7, 0xfa, 0x3d,
+	0xd9, 0x29, 0x77, 0x67, 0xf1, 0x95, 0x62, 0x54, 0xbd, 0x3a, 0x1a, 0xd6, 0x17, 0xc7, 0x48, 0x68,
+	0x5c, 0x6f, 0x2a, 0x95, 0x17, 0x66, 0x98, 0xca, 0x8d, 0xbf, 0x2b, 0x00, 0xa6, 0xad, 0x82, 0x4d,
+	0x50, 0xea, 0xf2, 0x1f, 0xa2, 0x64, 0x05, 0x49, 0x12, 0xad, 0xf3, 0xf7, 0x42, 0x06, 0x8a, 0x65,
+	0x78, 0x9d, 0xf6, 0xc8, 0x01, 0xb6, 0x70, 0x62, 0x08, 0x90, 0xa9, 0x13, 0xd5, 0x69, 0x34, 0x29,
+	0x80, 0xd2, 0x77, 0xe0, 0xf7, 0x40, 0x59, 0xd4, 0xa7, 0x47, 0xd6, 0x21, 0xa1, 0xc1, 0xbe, 0x5e,
+	0x8c, 0xdb, 0x5f, 0x27, 0x66, 0xa1, 0xa4, 0x5c, 0xe3, 0xbf, 0x0a, 0x58, 0x90, 0x5b, 0x10, 0x74,
+	0xc0, 0xbc, 0x83, 0x99, 0xd9, 0x27, 0xf2, 0x61, 0x4d, 0xb5, 0xb7, 0xee, 0x0a, 0xa4, 0x68, 0xae,
+	0x11, 0x6f, 0x2b, 0xa0, 0x21, 0xa9, 0x05, 0x9e, 0x44, 0x0f, 0x39, 0x37, 0xd3, 0xbf, 0x43, 0x65,
+	0xbd, 0xe3, 0x2f, 0x15, 0x00, 0x62, 0x91, 0x97, 0x3d, 0xe3, 0x77, 0x41, 0xc9, 0xb0, 0x7c, 0xca,
+	0x88, 0xb7, 0x7d, 0x57, 0x7e, 0x0d, 0xd1, 0x0c, 0x36, 0x43, 0x22, 0x8a, 0xf9, 0xf0, 0x3d, 0x50,
+	0xc0, 0x3e, 0x3b, 0x96, 0xef, 0x58, 0xe5, 0xef, 0xa1, 0xe5, 0xb3, 0xe3, 0x17, 0x3c, 0x81, 0x7c,
+	0x76, 0x1c, 0x7d, 0x34, 0x21, 0x95, 0xca, 0xca, 0xc2, 0x2c, 0xb3, 0xf2, 0xd3, 0x65, 0xb0, 0x34,
+	0x1e, 0x78, 0xf8, 0x5e, 0x62, 0x9b, 0x51, 0x44, 0xff, 0x8e, 0xf6, 0xfa, 0x8c, 0x8d, 0x26, 0xf4,
+	0x25, 0x77, 0x21, 0x5f, 0x26, 0x67, 0xe2, 0xfc, 0xd7, 0x31, 0x13, 0x67, 0x2f, 0x61, 0x85, 0xaf,
+	0x77, 0x09, 0xfb, 0xe6, 0xec, 0x35, 0x7f, 0x9a, 0x9c, 0xf6, 0xe7, 0xc5, 0x54, 0xfa, 0xc9, 0xec,
+	0xde, 0xfe, 0x6c, 0xe6, 0xfd, 0x85, 0x19, 0xcd, 0xfb, 0xc9, 0x15, 0xaa, 0xf8, 0xba, 0x56, 0xa8,
+	0x8c, 0xa5, 0xa2, 0xf4, 0x1a, 0x96, 0x8a, 0x06, 0x98, 0xb7, 0xf1, 0x59, 0xab, 0x4b, 0xc4, 0xca,
+	0x52, 0x0a, 0x0a, 0x5f, 0x5b, 0x50, 0x90, 0xe4, 0xfc, 0xdf, 0x17, 0x8f, 0xec, 0xe9, 0xbd, 0xf2,
+	0x4a, 0xd3, 0x7b, 0xe6, 0x12, 0xb3, 0x38, 0xe5, 0x12, 0xb3, 0x74, 0xe1, 0x25, 0x66, 0x79, 0x8a,
+	0x25, 0xe6, 0x1d, 0xb0, 0x60, 0xe3, 0xb3, 0x36, 0x95, 0x7b, 0x47, 0x41, 0x2f, 0xf3, 0x21, 0xb0,
+	0x1d, 0x90, 0x50, 0xc8, 0xe3, 0x86, 0xd9, 0xf8, 0x4c, 0x1f, 0x30, 0xc2, 0x97, 0x8e, 0x68, 0x3f,
+	0x69, 0x4b, 0x1a, 0x8a, 0xb8, 0x12, 0xb0, 0xe3, 0x1f, 0x50, 0xb1, 0x6d, 0xc4, 0x80, 0x9c, 0x84,
+	0x42, 0xde, 0x65, 0x77, 0x0c, 0xb8, 0x03, 0xd6, 0x3c, 0x7c, 0xc4, 0xee, 0x13, 0xec, 0xb1, 0x03,
+	0x82, 0xd9, 0xbe, 0x69, 0x13, 0xd7, 0x67, 0xea, 0x5a, 0xd4, 0x00, 0xd6, 0x50, 0x06, 0x1f, 0x65,
+	0xde, 0x82, 0xdb, 0x60, 0x95, 0xd3, 0xb7, 0xf8, 0x13, 0x36, 0x5d, 0x27, 0x04, 0x7b, 0x43, 0x80,
+	0xbd, 0x39, 0x1a, 0xd6, 0x57, 0x51, 0x9a, 0x8d, 0xb2, 0xee, 0xc0, 0x1f, 0x83, 0x15, 0x4e, 0xde,
+	0x21, 0x98, 0x92, 0x10, 0xe7, 0x5b, 0xc1, 0xbe, 0xc0, 0x33, 0x11, 0x4d, 0xf0, 0x50, 0x4a, 0x1a,
+	0x6e, 0x82, 0x2a, 0xa7, 0x6d, 0xba, 0xb6, 0x6d, 0x46, 0x7e, 0xbd, 0x29, 0x20, 0x44, 0x21, 0x47,
+	0x93, 0x4c, 0x94, 0x96, 0x9f, 0x7e, 0x07, 0xfb, 0x73, 0x0e, 0xac, 0x66, 0x34, 0x35, 0xee, 0x1f,
+	0x65, 0xae, 0x87, 0xbb, 0x24, 0x4e, 0x6d, 0x25, 0xf6, 0xaf, 0x33, 0xc1, 0x43, 0x29, 0x69, 0xf8,
+	0x14, 0x80, 0xa0, 0xf9, 0xb7, 0xdd, 0x43, 0xa9, 0x58, 0xbf, 0xc3, 0x3f, 0x75, 0x2b, 0xa2, 0xbe,
+	0x18, 0xd6, 0x6f, 0x64, 0xfd, 0xef, 0x27, 0xb4, 0x87, 0x3d, 0x71, 0x2d, 0xdf, 0x26, 0xf1, 0x05,
+	0x94, 0x80, 0x84, 0x3f, 0x03, 0xa0, 0x2f, 0xf8, 0x1d, 0xf3, 0x57, 0x61, 0x73, 0xff, 0xca, 0x7f,
+	0x22, 0x68, 0xe1, 0xbf, 0xa9, 0xb4, 0x9f, 0xf8, 0xd8, 0x61, 0xfc, 0x7d, 0x88, 0xdc, 0x7b, 0x12,
+	0xa1, 0xa0, 0x04, 0xa2, 0xae, 0x3d, 0x7b, 0x5e, 0xbb, 0xf2, 0xd9, 0xf3, 0xda, 0x95, 0xcf, 0x9f,
+	0xd7, 0xae, 0xfc, 0x7a, 0x54, 0x53, 0x9e, 0x8d, 0x6a, 0xca, 0x67, 0xa3, 0x9a, 0xf2, 0xf9, 0xa8,
+	0xa6, 0x7c, 0x31, 0xaa, 0x29, 0x9f, 0x7e, 0x59, 0xbb, 0xf2, 0x71, 0x31, 0x6c, 0x2b, 0xff, 0x0b,
+	0x00, 0x00, 0xff, 0xff, 0xa6, 0x02, 0x65, 0xac, 0xb5, 0x1e, 0x00, 0x00,
 }
 
 func (m *BusConfig) Marshal() (dAtA []byte, err error) {
@@ -1257,11 +1257,6 @@ func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	i -= len(m.StreamConfig)
-	copy(dAtA[i:], m.StreamConfig)
-	i = encodeVarintGenerated(dAtA, i, uint64(len(m.StreamConfig)))
-	i--
-	dAtA[i] = 0x3a
 	if m.AccessSecret != nil {
 		{
 			size, err := m.AccessSecret.MarshalToSizedBuffer(dAtA[:i])
@@ -1272,7 +1267,7 @@ func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintGenerated(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x32
+		dAtA[i] = 0x3a
 	}
 	if m.ConsumerGroup != nil {
 		{
@@ -1284,7 +1279,7 @@ func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintGenerated(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x2a
+		dAtA[i] = 0x32
 	}
 	if m.SASL != nil {
 		{
@@ -1296,7 +1291,7 @@ func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintGenerated(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x22
+		dAtA[i] = 0x2a
 	}
 	if m.TLS != nil {
 		{
@@ -1308,12 +1303,17 @@ func (m *KafkaConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintGenerated(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x22
 	}
 	i -= len(m.Topic)
 	copy(dAtA[i:], m.Topic)
 	i = encodeVarintGenerated(dAtA, i, uint64(len(m.Topic)))
 	i--
+	dAtA[i] = 0x1a
+	i -= len(m.Version)
+	copy(dAtA[i:], m.Version)
+	i = encodeVarintGenerated(dAtA, i, uint64(len(m.Version)))
+	i--
 	dAtA[i] = 0x12
 	i -= len(m.URL)
 	copy(dAtA[i:], m.URL)
@@ -2001,6 +2001,8 @@ func (m *KafkaConfig) Size() (n int) {
 	_ = l
 	l = len(m.URL)
 	n += 1 + l + sovGenerated(uint64(l))
+	l = len(m.Version)
+	n += 1 + l + sovGenerated(uint64(l))
 	l = len(m.Topic)
 	n += 1 + l + sovGenerated(uint64(l))
 	if m.TLS != nil {
@@ -2019,8 +2021,6 @@ func (m *KafkaConfig) Size() (n int) {
 		l = m.AccessSecret.Size()
 		n += 1 + l + sovGenerated(uint64(l))
 	}
-	l = len(m.StreamConfig)
-	n += 1 + l + sovGenerated(uint64(l))
 	return n
 }
 
@@ -2355,12 +2355,12 @@ func (this *KafkaConfig) String() string {
 	}
 	s := strings.Join([]string{`&KafkaConfig{`,
 		`URL:` + fmt.Sprintf("%v", this.URL) + `,`,
+		`Version:` + fmt.Sprintf("%v", this.Version) + `,`,
 		`Topic:` + fmt.Sprintf("%v", this.Topic) + `,`,
 		`TLS:` + strings.Replace(fmt.Sprintf("%v", this.TLS), "TLSConfig", "common.TLSConfig", 1) + `,`,
 		`SASL:` + strings.Replace(fmt.Sprintf("%v", this.SASL), "SASLConfig", "common.SASLConfig", 1) + `,`,
 		`ConsumerGroup:` + strings.Replace(this.ConsumerGroup.String(), "KafkaConsumerGroup", "KafkaConsumerGroup", 1) + `,`,
 		`AccessSecret:` + strings.Replace(fmt.Sprintf("%v", this.AccessSecret), "SecretKeySelector", "v1.SecretKeySelector", 1) + `,`,
-		`StreamConfig:` + fmt.Sprintf("%v", this.StreamConfig) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -4385,7 +4385,7 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Topic", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -4413,13 +4413,13 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Topic = string(dAtA[iNdEx:postIndex])
+			m.Version = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TLS", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Topic", wireType)
 			}
-			var msglen int
+			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowGenerated
@@ -4429,31 +4429,27 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= int(b&0x7F) << shift
+				stringLen |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if msglen < 0 {
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
 				return ErrInvalidLengthGenerated
 			}
-			postIndex := iNdEx + msglen
+			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.TLS == nil {
-				m.TLS = &common.TLSConfig{}
-			}
-			if err := m.TLS.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
+			m.Topic = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 4:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field SASL", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field TLS", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -4480,16 +4476,16 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.SASL == nil {
-				m.SASL = &common.SASLConfig{}
+			if m.TLS == nil {
+				m.TLS = &common.TLSConfig{}
 			}
-			if err := m.SASL.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.TLS.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 5:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ConsumerGroup", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field SASL", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -4516,16 +4512,16 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.ConsumerGroup == nil {
-				m.ConsumerGroup = &KafkaConsumerGroup{}
+			if m.SASL == nil {
+				m.SASL = &common.SASLConfig{}
 			}
-			if err := m.ConsumerGroup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.SASL.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 6:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AccessSecret", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ConsumerGroup", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -4552,18 +4548,18 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.AccessSecret == nil {
-				m.AccessSecret = &v1.SecretKeySelector{}
+			if m.ConsumerGroup == nil {
+				m.ConsumerGroup = &KafkaConsumerGroup{}
 			}
-			if err := m.AccessSecret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ConsumerGroup.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 7:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field StreamConfig", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field AccessSecret", wireType)
 			}
-			var stringLen uint64
+			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowGenerated
@@ -4573,23 +4569,27 @@ func (m *KafkaConfig) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
+			if msglen < 0 {
 				return ErrInvalidLengthGenerated
 			}
-			postIndex := iNdEx + intStringLen
+			postIndex := iNdEx + msglen
 			if postIndex < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.StreamConfig = string(dAtA[iNdEx:postIndex])
+			if m.AccessSecret == nil {
+				m.AccessSecret = &v1.SecretKeySelector{}
+			}
+			if err := m.AccessSecret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto
index 4e16bd5a92..7f580eb4bf 100644
--- a/pkg/apis/eventbus/v1alpha1/generated.proto
+++ b/pkg/apis/eventbus/v1alpha1/generated.proto
@@ -218,30 +218,29 @@ message KafkaConfig {
   // URL to kafka cluster, multiple URLs separated by comma
   optional string url = 1;
 
+  // Kafka version, sarama defaults to the oldest supported stable version
+  // +optional
+  optional string version = 2;
+
   // Topic name, defaults to namespace_name.eventbus_name
   // +optional
-  optional string topic = 2;
+  optional string topic = 3;
 
   // TLS configuration for the kafka client.
   // +optional
-  optional github.com.argoproj.argo_events.pkg.apis.common.TLSConfig tls = 3;
+  optional github.com.argoproj.argo_events.pkg.apis.common.TLSConfig tls = 4;
 
   // SASL configuration for the kafka client
   // +optional
-  optional github.com.argoproj.argo_events.pkg.apis.common.SASLConfig sasl = 4;
+  optional github.com.argoproj.argo_events.pkg.apis.common.SASLConfig sasl = 5;
 
   // Consumer group for kafka client
   // +optional
-  optional KafkaConsumerGroup consumerGroup = 5;
+  optional KafkaConsumerGroup consumerGroup = 6;
 
   // Secret for auth
   // +optional
-  optional k8s.io.api.core.v1.SecretKeySelector accessSecret = 6;
-
-  // Optional configuration for the kafka, if specified, it will be merged with the default configuration in controller-config.
-  // It accepts a YAML format configuration, available fields include, "maxRetry", "configVersion (sarama config version)", "requiredAcks", "replication".
-  // +optional
-  optional string streamConfig = 7;
+  optional k8s.io.api.core.v1.SecretKeySelector accessSecret = 7;
 }
 
 message KafkaConsumerGroup {
diff --git a/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go b/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go
index 3f6a5a639d..b780ea03ed 100644
--- a/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go
+++ b/pkg/apis/eventbus/v1alpha1/kafka_eventbus.go
@@ -16,7 +16,7 @@ type KafkaConfig struct {
 	URL string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"`
 	// Kafka version, sarama defaults to the oldest supported stable version
 	// +optional
-	Version string `json:"url,omitempty" protobuf:"bytes,2,opt,name=version"`
+	Version string `json:"version,omitempty" protobuf:"bytes,2,opt,name=version"`
 	// Topic name, defaults to namespace_name.eventbus_name
 	// +optional
 	Topic string `json:"topic,omitempty" protobuf:"bytes,3,opt,name=topic"`
diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
index 87baa3aed5..6de8e91516 100644
--- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go
+++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
@@ -525,6 +525,13 @@ func schema_pkg_apis_eventbus_v1alpha1_KafkaConfig(ref common.ReferenceCallback)
 							Format:      "",
 						},
 					},
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kafka version, sarama defaults to the oldest supported stable version",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
 					"topic": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Topic name, defaults to namespace_name.eventbus_name",
@@ -556,13 +563,6 @@ func schema_pkg_apis_eventbus_v1alpha1_KafkaConfig(ref common.ReferenceCallback)
 							Ref:         ref("k8s.io/api/core/v1.SecretKeySelector"),
 						},
 					},
-					"streamConfig": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Optional configuration for the kafka, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxRetry\", \"configVersion (sarama config version)\", \"requiredAcks\", \"replication\".",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
 				},
 			},
 		},