Disabled tracing by default (#805)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jaegertracing · Dec 5, 2019 · e07e74f · e07e74f
1 parent 468a8aa
commit e07e74f
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 14 deletions.
diff --git a/deploy/examples/operator-with-tracing.yaml b/deploy/examples/operator-with-tracing.yaml
@@ -0,0 +1,52 @@
+# this is an example `operator.yaml` with all the bits required to get the Jaeger Operator
+# to generate spans for its own operations. See the operator documentation for more information about this feature.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jaeger-operator
+  namespace: observability
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: jaeger-operator
+  template:
+    metadata:
+      labels:
+        name: jaeger-operator
+    spec:
+      serviceAccountName: jaeger-operator
+      containers:
+      - name: jaeger-operator
+        image: jaegertracing/jaeger-operator:1.16.0 # operator tracing is available since 1.16.0
+        ports:
+        - containerPort: 8383
+          name: metrics
+        args: ["start", "--tracing-enabled=true"]
+        imagePullPolicy: Always
+        env:
+        - name: WATCH_NAMESPACE
+          value: ""
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: OPERATOR_NAME
+          value: "jaeger-operator"
+      - name: jaeger-agent
+        image: jaegertracing/jaeger-agent:1.16.0
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        args:
+        - --reporter.grpc.host-port=dns:///jaeger-collector-headless.$(POD_NAMESPACE).svc.cluster.local:14250
+        ports:
+        - containerPort: 6831
+          name: jg-compact-trft
+          protocol: UDP
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -35,16 +35,3 @@ spec:
               fieldPath: metadata.namespace
         - name: OPERATOR_NAME
           value: "jaeger-operator"
-      - name: jaeger-agent
-        image: jaegertracing/jaeger-agent:1.15.1
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        args:
-        - --reporter.grpc.host-port=dns:///jaeger-collector-headless.$(POD_NAMESPACE).svc.cluster.local:14250
-        ports:
-        - containerPort: 6831
-          name: jg-compact-trft
-          protocol: UDP
diff --git a/pkg/cmd/start/main.go b/pkg/cmd/start/main.go
@@ -83,7 +83,7 @@ func NewStartCommand() *cobra.Command {
 	cmd.Flags().String("jaeger-agent-hostport", "localhost:6831", "The location for the Jaeger Agent")
 	viper.BindPFlag("jaeger-agent-hostport", cmd.Flags().Lookup("jaeger-agent-hostport"))
 
-	cmd.Flags().Bool("tracing-enabled", true, "Whether the Operator should report its own spans to a Jaeger instance")
+	cmd.Flags().Bool("tracing-enabled", false, "Whether the Operator should report its own spans to a Jaeger instance")
 	viper.BindPFlag("tracing-enabled", cmd.Flags().Lookup("tracing-enabled"))
 
 	return cmd