Add linkerd.io/inject=disabled annotation

pkg/cronjob/es_index_cleaner.go

@@ -78,6 +78,7 @@ func CreateEsIndexCleaner(jaeger *v1.Jaeger) *batchv1beta1.CronJob {
 							Annotations: map[string]string{
 								"prometheus.io/scrape":    "false",
 								"sidecar.istio.io/inject": "false",
+								"linkerd.io/inject":       "disabled",
 							},
 						},
 					},

pkg/cronjob/es_rollover.go

@@ -53,6 +53,7 @@ func rollover(jaeger *v1.Jaeger) batchv1beta1.CronJob {
 							Annotations: map[string]string{
 								"prometheus.io/scrape":    "false",
 								"sidecar.istio.io/inject": "false",
+								"linkerd.io/inject":       "disabled",
 							},
 						},
 						Spec: corev1.PodSpec{
@@ -107,6 +108,7 @@ func lookback(jaeger *v1.Jaeger) batchv1beta1.CronJob {
 							Annotations: map[string]string{
 								"prometheus.io/scrape":    "false",
 								"sidecar.istio.io/inject": "false",
+								"linkerd.io/inject":       "disabled",
 							},
 						},
 						Spec: corev1.PodSpec{

pkg/cronjob/spark_dependencies.go

@@ -77,6 +77,7 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) *batchv1beta1.CronJob {
 							Annotations: map[string]string{
 								"prometheus.io/scrape":    "false",
 								"sidecar.istio.io/inject": "false",
+								"linkerd.io/inject":       "disabled",
 							},
 						},
 					},

pkg/deployment/agent.go

@@ -64,6 +64,7 @@ func (a *Agent) Get() *appsv1.DaemonSet {
 			"prometheus.io/scrape":    "true",
 			"prometheus.io/port":      strconv.Itoa(int(adminPort)),
 			"sidecar.istio.io/inject": "false",
+			"linkerd.io/inject":       "disabled",
 		},
 		Labels: labels,
 	}

pkg/deployment/agent_test.go

@@ -85,6 +85,7 @@ func TestDaemonSetAgentAnnotations(t *testing.T) {
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["sidecar.istio.io/inject"])
 	assert.Equal(t, "world", dep.Spec.Template.Annotations["hello"])
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["prometheus.io/scrape"])
+	assert.Equal(t, "disabled", dep.Spec.Template.Annotations["linkerd.io/inject"])
 }
 
 func TestDaemonSetAgentLabels(t *testing.T) {

pkg/deployment/all-in-one.go

@@ -49,6 +49,7 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 			"prometheus.io/scrape":    "true",
 			"prometheus.io/port":      strconv.Itoa(int(adminPort)),
 			"sidecar.istio.io/inject": "false",
+			"linkerd.io/inject":       "disabled",
 		},
 		Labels: labels,
 	}

pkg/deployment/all-in-one_test.go

@@ -59,6 +59,7 @@ func TestAllInOneAnnotations(t *testing.T) {
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["sidecar.istio.io/inject"])
 	assert.Equal(t, "world", dep.Spec.Template.Annotations["hello"])
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["prometheus.io/scrape"])
+	assert.Equal(t, "disabled", dep.Spec.Template.Annotations["linkerd.io/inject"])
 }
 
 func TestAllInOneLabels(t *testing.T) {

pkg/deployment/collector.go

@@ -60,6 +60,7 @@ func (c *Collector) Get() *appsv1.Deployment {
 			"prometheus.io/scrape":    "true",
 			"prometheus.io/port":      strconv.Itoa(int(adminPort)),
 			"sidecar.istio.io/inject": "false",
+			"linkerd.io/inject":       "disabled",
 		},
 		Labels: labels,
 	}

pkg/deployment/collector_test.go

@@ -132,6 +132,7 @@ func TestCollectorAnnotations(t *testing.T) {
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["sidecar.istio.io/inject"])
 	assert.Equal(t, "world", dep.Spec.Template.Annotations["hello"])
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["prometheus.io/scrape"])
+	assert.Equal(t, "disabled", dep.Spec.Template.Annotations["linkerd.io/inject"])
 }
 
 func TestCollectorLabels(t *testing.T) {

pkg/deployment/ingester.go

@@ -62,6 +62,7 @@ func (i *Ingester) Get() *appsv1.Deployment {
 			"prometheus.io/scrape":    "true",
 			"prometheus.io/port":      strconv.Itoa(int(adminPort)),
 			"sidecar.istio.io/inject": "false",
+			"linkerd.io/inject":       "disabled",
 		},
 		Labels: labels,
 	}

pkg/deployment/ingester_test.go

@@ -130,6 +130,7 @@ func TestIngesterAnnotations(t *testing.T) {
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["sidecar.istio.io/inject"])
 	assert.Equal(t, "world", dep.Spec.Template.Annotations["hello"])
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["prometheus.io/scrape"])
+	assert.Equal(t, "disabled", dep.Spec.Template.Annotations["linkerd.io/inject"])
 }
 
 func TestIngesterLabels(t *testing.T) {

pkg/deployment/query.go

@@ -58,6 +58,7 @@ func (q *Query) Get() *appsv1.Deployment {
 			"prometheus.io/scrape":    "true",
 			"prometheus.io/port":      strconv.Itoa(int(adminPort)),
 			"sidecar.istio.io/inject": "false",
+			"linkerd.io/inject":       "disabled",
 
 			// note that we are explicitly using a string here, not the value from `inject.Annotation`
 			// this has two reasons:

pkg/deployment/query_test.go

@@ -107,6 +107,7 @@ func TestQueryAnnotations(t *testing.T) {
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["sidecar.istio.io/inject"])
 	assert.Equal(t, "world", dep.Spec.Template.Annotations["hello"])
 	assert.Equal(t, "false", dep.Spec.Template.Annotations["prometheus.io/scrape"])
+	assert.Equal(t, "disabled", dep.Spec.Template.Annotations["linkerd.io/inject"])
 }
 
 func TestQueryLabels(t *testing.T) {

pkg/storage/cassandra_dependencies.go

@@ -48,6 +48,7 @@ func cassandraDeps(jaeger *v1.Jaeger) []batchv1.Job {
 	annotations := map[string]string{
 		"prometheus.io/scrape":    "false",
 		"sidecar.istio.io/inject": "false",
+		"linkerd.io/inject":       "disabled",
 	}
 
 	// TODO: should this be configurable? Would we ever think that 2 minutes is OK for this job to complete?

pkg/storage/elasticsearch_dependencies.go

@@ -33,6 +33,7 @@ func elasticsearchDependencies(jaeger *v1.Jaeger) []batchv1.Job {
 					Annotations: map[string]string{
 						"prometheus.io/scrape":    "false",
 						"sidecar.istio.io/inject": "false",
+						"linkerd.io/inject":       "disabled",
 					},
 				},
 				Spec: corev1.PodSpec{