Skip to content

Commit 2ed5f73

Browse files
committed
expose collector via ingress and deprecate .spec.ingress in favour of .spec.query.ingress
Signed-off-by: Pranoy Kundu <[email protected]>
1 parent dde9e07 commit 2ed5f73

33 files changed

+22478
-7881
lines changed

apis/v1/jaeger_types.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ type JaegerSpec struct {
157157
// +optional
158158
Storage JaegerStorageSpec `json:"storage,omitempty"`
159159

160+
// Deprecated in favour of .Spec.Collector.Ingress and .Spec.Query.Ingress
160161
// +optional
161162
Ingress JaegerIngressSpec `json:"ingress,omitempty"`
162163

@@ -296,6 +297,9 @@ type JaegerQuerySpec struct {
296297
// +optional
297298
// +nullable
298299
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
300+
301+
// +optional
302+
Ingress JaegerIngressSpec `json:"ingress,omitempty"`
299303
}
300304

301305
// JaegerUISpec defines the options to be used to configure the UI
@@ -472,6 +476,9 @@ type JaegerCollectorSpec struct {
472476

473477
// +optional
474478
TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
479+
480+
// +optional
481+
Ingress JaegerIngressSpec `json:"ingress,omitempty"`
475482
}
476483

477484
// JaegerIngesterSpec defines the options to be used when deploying the ingester

apis/v1/zz_generated.deepcopy.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/jaegertracing.io_jaegers.yaml

Lines changed: 5476 additions & 2608 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)