Allow setting schema registry configuration parameters via the RPK no…

…de config block
redpanda-data · Nov 5, 2024 · 3dc87d8 · 3dc87d8
1 parent cc56695
commit 3dc87d8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/go/rpk/pkg/cli/profile/create.go b/src/go/rpk/pkg/cli/profile/create.go
@@ -259,6 +259,7 @@ func CreateFlow(
 		p = &config.RpkProfile{
 			KafkaAPI: nodeCfg.KafkaAPI,
 			AdminAPI: nodeCfg.AdminAPI,
+			SR:       nodeCfg.SR,
 		}
 	}
 	if err := doSet(p, set); err != nil {

diff --git a/src/go/rpk/pkg/config/config.go b/src/go/rpk/pkg/config/config.go
@@ -247,6 +247,7 @@ func (y *RedpandaYaml) setDevMode() {
 	y.Rpk = RpkNodeConfig{
 		KafkaAPI:             y.Rpk.KafkaAPI,
 		AdminAPI:             y.Rpk.AdminAPI,
+		SR:                   y.Rpk.SR,
 		AdditionalStartFlags: y.Rpk.AdditionalStartFlags,
 		SMP:                  DevDefault().Rpk.SMP,
 		Overprovisioned:      true,

diff --git a/src/go/rpk/pkg/config/params.go b/src/go/rpk/pkg/config/params.go
@@ -1389,6 +1389,9 @@ func (c *Config) mergeRpkIntoRedpanda(actual bool) {
 	if !reflect.DeepEqual(p.AdminAPI, RpkAdminAPI{}) {
 		dst.AdminAPI = p.AdminAPI
 	}
+	if !reflect.DeepEqual(p.SR, RpkSchemaRegistryAPI{}) {
+		dst.SR = p.SR
+	}
 }
 
 // This function ensures a current profile exists in the Virtual rpk.yaml.
@@ -1473,6 +1476,9 @@ func (c *Config) mergeRedpandaIntoRpk() {
 	if reflect.DeepEqual(p.AdminAPI, RpkAdminAPI{}) {
 		p.AdminAPI = src.AdminAPI
 	}
+	if reflect.DeepEqual(p.SR, RpkSchemaRegistryAPI{}) {
+		p.SR = src.SR
+	}
 }
 
 // Similar to backcompat flags, we first capture old env vars and then new

diff --git a/src/go/rpk/pkg/config/params_test.go b/src/go/rpk/pkg/config/params_test.go
@@ -909,6 +909,9 @@ rpk:
     admin_api:
         addresses:
             - 0.0.0.3:9644
+    schema_registry:
+        addresses:
+            - 0.0.0.2:8081
     overprovisioned: true
     coredump_dir: /var/lib/redpanda/coredump
 pandaproxy: {}

diff --git a/src/go/rpk/pkg/config/redpanda_yaml.go b/src/go/rpk/pkg/config/redpanda_yaml.go
@@ -141,8 +141,9 @@ type (
 	}
 
 	RpkNodeConfig struct {
-		KafkaAPI RpkKafkaAPI `yaml:"kafka_api,omitempty" json:"kafka_api"`
-		AdminAPI RpkAdminAPI `yaml:"admin_api,omitempty" json:"admin_api"`
+		KafkaAPI RpkKafkaAPI          `yaml:"kafka_api,omitempty" json:"kafka_api"`
+		AdminAPI RpkAdminAPI          `yaml:"admin_api,omitempty" json:"admin_api"`
+		SR       RpkSchemaRegistryAPI `yaml:"schema_registry,omitempty" json:"schema_registry"`
 
 		// The following four configs are passed to redpanda on `rpk
 		// redpanda start`. They are not tuner configs. They live here