Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zilliztech/milvus-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1d2feed51937904a309d0b1e41a8d0df52364ff2
Choose a base ref
..
head repository: zilliztech/milvus-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c851d0bb8a10053a20412f56375c1414ff623879
Choose a head ref
Showing with 4 additions and 3 deletions.
  1. +3 −3 pkg/controllers/status_cluster.go
  2. +1 −0 pkg/external/kafka_test.go
6 changes: 3 additions & 3 deletions pkg/controllers/status_cluster.go
View file
Original file line number Diff line number Diff line change
@@ -369,19 +369,19 @@ func (r *MilvusStatusSyncer) GetMilvusEndpoint(ctx context.Context, mc v1beta1.M

// GetKafkaConfFromCR get kafka config from CR
func GetKafkaConfFromCR(mc v1beta1.Milvus) (*external.CheckKafkaConfig, error) {
kafkaConf := external.CheckKafkaConfig{}
kafkaConf := new(external.CheckKafkaConfig)
allConf := mc.Spec.Conf
kafkaConfData, exist := allConf.Data["kafka"]
if exist {
kafkaConfValues := v1beta1.Values{
Data: kafkaConfData.(map[string]interface{}),
}
err := kafkaConfValues.AsObject(&kafkaConf)
err := kafkaConfValues.AsObject(kafkaConf)
if err != nil {
return nil, errors.Wrap(err, "decode kafka config failed")
}
}
return &kafkaConf, nil
return kafkaConf, nil
}

func (r *MilvusStatusSyncer) GetMsgStreamCondition(
1 change: 1 addition & 0 deletions pkg/external/kafka_test.go
View file
Original file line number Diff line number Diff line change
@@ -138,5 +138,6 @@ func TestGetKafkaConfFromCR(t *testing.T) {
},
}
_, err = GetKafkaConfFromCR(mc)
assert.Equal(t, []string{"dummy:9092"}, conf.BrokerList)
assert.Error(t, err)
}