expose collector via ingress and deprecate .spec.ingress in favour of…

… .spec.query.ingress Signed-off-by: Pranoy Kundu <[email protected]>
jaegertracing · Aug 9, 2023 · 2ed5f73 · 2ed5f73
1 parent dde9e07
commit 2ed5f73
Show file tree

Hide file tree

Showing 33 changed files with 22,478 additions and 7,881 deletions.
diff --git a/apis/v1/jaeger_types.go b/apis/v1/jaeger_types.go
@@ -157,6 +157,7 @@ type JaegerSpec struct {
 	// +optional
 	Storage JaegerStorageSpec `json:"storage,omitempty"`
 
+	// Deprecated in favour of .Spec.Collector.Ingress and .Spec.Query.Ingress
 	// +optional
 	Ingress JaegerIngressSpec `json:"ingress,omitempty"`
 
@@ -296,6 +297,9 @@ type JaegerQuerySpec struct {
 	// +optional
 	// +nullable
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
+	// +optional
+	Ingress JaegerIngressSpec `json:"ingress,omitempty"`
 }
 
 // JaegerUISpec defines the options to be used to configure the UI
@@ -472,6 +476,9 @@ type JaegerCollectorSpec struct {
 
 	// +optional
 	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
+
+	// +optional
+	Ingress JaegerIngressSpec `json:"ingress,omitempty"`
 }
 
 // JaegerIngesterSpec defines the options to be used when deploying the ingester

diff --git a/apis/v1/zz_generated.deepcopy.go b/apis/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/jaegertracing.io_jaegers.yaml b/config/crd/bases/jaegertracing.io_jaegers.yaml