reslove conflict

Signed-off-by: [email protected] <[email protected]>
jaegertracing · May 27, 2022 · 6e085c1 · 6e085c1
1 parent b6fbf34
commit 6e085c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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