From 6e085c1af24debe7a64f7a7c65d7e97ecdd59e23 Mon Sep 17 00:00:00 2001 From: "luohua13@alauda.io" Date: Fri, 27 May 2022 16:33:40 +0800 Subject: [PATCH] reslove conflict Signed-off-by: luohua13@alauda.io --- apis/v1/jaeger_types.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apis/v1/jaeger_types.go b/apis/v1/jaeger_types.go index 8d1fc53bf6..2b19bef7d1 100644 --- a/apis/v1/jaeger_types.go +++ b/apis/v1/jaeger_types.go @@ -434,6 +434,8 @@ type JaegerCollectorSpec struct { // +optional // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Strategy" Strategy *appsv1.DeploymentStrategy `json:"strategy,omitempty"` + + // +optional KafkaSecretName string `json:"kafkaSecretName"` } @@ -461,11 +463,10 @@ type JaegerIngesterSpec struct { Config FreeForm `json:"config,omitempty"` // +optional -<<<<<<< HEAD:apis/v1/jaeger_types.go Strategy *appsv1.DeploymentStrategy `json:"strategy,omitempty"` -======= + + // +optional KafkaSecretName string `json:"kafkaSecretName"` ->>>>>>> c953130e (add kafkaSecretName for collector and ingester):pkg/apis/jaegertracing/v1/jaeger_types.go } // JaegerAgentSpec defines the options to be used when deploying the agent