add env var JAEGER_DISABLED

deploy/crds/jaegertracing.io_jaegers_crd.yaml

@@ -1607,6 +1607,8 @@ spec:
                   type: object
                 image:
                   type: string
+                jaegerDisabled:
+                  type: boolean
                 labels:
                   additionalProperties:
                     type: string
@@ -5520,6 +5522,8 @@ spec:
                   type: object
                 image:
                   type: string
+                jaegerDisabled:
+                  type: boolean
                 labels:
                   additionalProperties:
                     type: string

pkg/apis/jaegertracing/v1/jaeger_types.go

@@ -251,6 +251,12 @@ type JaegerQuerySpec struct {
 	// The default, if omitted, is ClusterIP.
 	// See https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
 	ServiceType v1.ServiceType `json:"serviceType,omitempty"`
+
+	// +optional
+	// JaegerDisabled adds the JAEGER_DISABLED environment flag to the
+	// query component to prevent it from adding its own traces.
+	// The default, if ommited, is false
+	JaegerDisabled *bool `json:"jaegerDisabled,omitempty"`
 }
 
 // JaegerUISpec defines the options to be used to configure the UI
@@ -341,6 +347,12 @@ type JaegerAllInOneSpec struct {
 
 	// +optional
 	JaegerCommonSpec `json:",inline,omitempty"`
+
+	// +optional
+	// JaegerDisabled adds the JAEGER_DISABLED environment flag to the
+	// query component to prevent it from adding its own traces.
+	// The default, if ommited, is false
+	JaegerDisabled *bool `json:"jaegerDisabled,omitempty"`
 }
 
 // AutoScaleSpec defines the common elements used for create HPAs

pkg/deployment/all_in_one.go

@@ -43,6 +43,11 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 
 	adminPort := util.GetAdminPort(args, 14269)
 
+	jaegerDisabled := &falseVar
+	if a.jaeger.Spec.AllInOne.JaegerDisabled != nil {
+		jaegerDisabled = a.jaeger.Spec.AllInOne.JaegerDisabled
+	}
+
 	baseCommonSpec := v1.JaegerCommonSpec{
 		Annotations: map[string]string{
 			"prometheus.io/scrape":    "true",
@@ -140,6 +145,10 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 								Name:  "COLLECTOR_ZIPKIN_HTTP_PORT",
 								Value: "9411",
 							},
+							{
+								Name:  "JAEGER_DISABLED",
+								Value: strconv.FormatBool(*jaegerDisabled),
+							},
 						},
 						VolumeMounts: commonSpec.VolumeMounts,
 						EnvFrom:      envFromSource,

pkg/deployment/all_in_one_test.go

@@ -41,6 +41,10 @@ func TestDefaultAllInOneImage(t *testing.T) {
 			Name:  "COLLECTOR_ZIPKIN_HTTP_PORT",
 			Value: "9411",
 		},
+		{
+			Name:  "JAEGER_DISABLED",
+			Value: "false",
+		},
 	}
 	assert.Equal(t, envvars, d.Spec.Template.Spec.Containers[0].Env)
 }
@@ -352,3 +356,21 @@ func TestAllInOneServiceLinks(t *testing.T) {
 	falseVar := false
 	assert.Equal(t, &falseVar, dep.Spec.Template.Spec.EnableServiceLinks)
 }
+
+func TestAllInOneJaegerDisabled(t *testing.T) {
+	jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestAllInOneJaegerDisabled"})
+	trueVar := true
+	jaeger.Spec.AllInOne.JaegerDisabled = &trueVar
+	d := NewAllInOne(jaeger).Get()
+	assert.Equal(t, "true", getEnvVarByName(d.Spec.Template.Spec.Containers[0].Env, "JAEGER_DISABLED").Value)
+}
+
+func getEnvVarByName(vars []corev1.EnvVar, name string) corev1.EnvVar {
+	envVar := corev1.EnvVar{}
+	for _, v := range vars {
+		if v.Name == name {
+			envVar = v
+		}
+	}
+	return envVar
+}

pkg/deployment/query.go

@@ -39,6 +39,11 @@ func (q *Query) Get() *appsv1.Deployment {
 
 	adminPort := util.GetAdminPort(args, 16687)
 
+	jaegerDisabled := &falseVar
+	if q.jaeger.Spec.Query.JaegerDisabled != nil {
+		jaegerDisabled = q.jaeger.Spec.Query.JaegerDisabled
+	}
+
 	baseCommonSpec := v1.JaegerCommonSpec{
 		Annotations: map[string]string{
 			"prometheus.io/scrape":    "true",
@@ -112,10 +117,16 @@ func (q *Query) Get() *appsv1.Deployment {
 						Image: util.ImageName(q.jaeger.Spec.Query.Image, "jaeger-query-image"),
 						Name:  "jaeger-query",
 						Args:  options,
-						Env: []corev1.EnvVar{{
-							Name:  "SPAN_STORAGE_TYPE",
-							Value: string(q.jaeger.Spec.Storage.Type),
-						}},
+						Env: []corev1.EnvVar{
+							{
+								Name:  "SPAN_STORAGE_TYPE",
+								Value: string(q.jaeger.Spec.Storage.Type),
+							},
+							{
+								Name:  "JAEGER_DISABLED",
+								Value: strconv.FormatBool(*jaegerDisabled),
+							},
+						},
 						VolumeMounts: commonSpec.VolumeMounts,
 						EnvFrom:      envFromSource,
 						Ports: []corev1.ContainerPort{

pkg/deployment/query_test.go

@@ -322,3 +322,12 @@ func TestQueryServiceLinks(t *testing.T) {
 	falseVar := false
 	assert.Equal(t, &falseVar, dep.Spec.Template.Spec.EnableServiceLinks)
 }
+
+func TestQueryJaegerDisabled(t *testing.T) {
+	jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestQueryJaegerDisabled"})
+	trueVar := true
+	jaeger.Spec.Query.JaegerDisabled = &trueVar
+	query := NewQuery(jaeger)
+	dep := query.Get()
+	assert.Equal(t, "true", getEnvVarByName(dep.Spec.Template.Spec.Containers[0].Env, "JAEGER_DISABLED").Value)
+}