Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-v1.12] kafka broker now supports all kafka topic config options (#3671) #1031

Merged
merged 1 commit into from
Mar 21, 2024
Merged

[release-v1.12] kafka broker now supports all kafka topic config options (#3671) #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions control-plane/pkg/kafka/topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ import (
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"knative.dev/pkg/configmap"
)

const (
DefaultTopicNumPartitionConfigMapKey = "default.topic.partitions"
DefaultTopicReplicationFactorConfigMapKey = "default.topic.replication.factor"
BootstrapServersConfigMapKey = "bootstrap.servers"
DefaultTopicConfigPrefix = "default.topic.config."

GroupIDConfigMapKey = "group.id"

Expand Down Expand Up @@ -97,6 +99,15 @@ func buildTopicConfigFromConfigMap(cm *corev1.ConfigMap) (*TopicConfig, error) {
return nil, fmt.Errorf("failed to parse config map %s/%s: %w", cm.Namespace, cm.Name, err)
}

for k, v := range cm.Data {
if s := strings.TrimPrefix(k, DefaultTopicConfigPrefix); s != k {
if topicDetail.ConfigEntries == nil {
topicDetail.ConfigEntries = make(map[string]*string)
}
topicDetail.ConfigEntries[s] = pointer.String(v)
}
}

topicDetail.ReplicationFactor = int16(replicationFactor)

config := &TopicConfig{
Expand Down
22 changes: 22 additions & 0 deletions control-plane/pkg/kafka/topic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
eventing "knative.dev/eventing/pkg/apis/eventing/v1"

kafkatesting "knative.dev/eventing-kafka-broker/control-plane/pkg/kafka/testing"
Expand Down Expand Up @@ -441,6 +442,27 @@ func TestTopicConfigFromConfigMap(t *testing.T) {
BootstrapServers: []string{"server1:9092", "server2:9092"},
},
},
{
name: "All valid, config options provided",
data: map[string]string{
"default.topic.partitions": "5",
"default.topic.replication.factor": "8",
"bootstrap.servers": "server1:9092, server2:9092",
"default.topic.config.retention.ms": "3600",
"default.topic.config.max.message.bytes": "68000",
},
want: TopicConfig{
TopicDetail: sarama.TopicDetail{
NumPartitions: 5,
ReplicationFactor: 8,
ConfigEntries: map[string]*string{
"retention.ms": pointer.String("3600"),
"max.message.bytes": pointer.String("68000"),
},
},
BootstrapServers: []string{"server1:9092", "server2:9092"},
},
},
{
name: "Missing keys 'default.topic.partitions' - not allowed",
data: map[string]string{
Expand Down