From df6c9cae722a32868a3b099adaefeefa0970497e Mon Sep 17 00:00:00 2001
From: Gary Brown <gary@brownuk.com>
Date: Tue, 16 Oct 2018 14:29:23 +0100
Subject: [PATCH] Add sidecar.istio.io/inject=false annotation to all-in-one,
 agent (daemonset), query and collector

Signed-off-by: Gary Brown <gary@brownuk.com>
---
 pkg/deployment/agent.go           | 5 +++--
 pkg/deployment/agent_test.go      | 6 +++++-
 pkg/deployment/all-in-one.go      | 5 +++--
 pkg/deployment/all-in-one_test.go | 2 ++
 pkg/deployment/collector.go       | 5 +++--
 pkg/deployment/collector_test.go  | 2 ++
 pkg/deployment/query.go           | 5 +++--
 pkg/deployment/query_test.go      | 2 ++
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkg/deployment/agent.go b/pkg/deployment/agent.go
index 128635751..46a16e374 100644
--- a/pkg/deployment/agent.go
+++ b/pkg/deployment/agent.go
@@ -43,8 +43,9 @@ func (a *Agent) Get() *appsv1.DaemonSet {
 	trueVar := true
 	selector := a.selector()
 	annotations := map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   "5778",
+		"prometheus.io/scrape":    "true",
+		"prometheus.io/port":      "5778",
+		"sidecar.istio.io/inject": "false",
 	}
 
 	return &appsv1.DaemonSet{
diff --git a/pkg/deployment/agent_test.go b/pkg/deployment/agent_test.go
index a9e88fa37..13b4f83d6 100644
--- a/pkg/deployment/agent_test.go
+++ b/pkg/deployment/agent_test.go
@@ -56,5 +56,9 @@ func TestGetDaemonSetDeployment(t *testing.T) {
 	jaeger := v1alpha1.NewJaeger("TestNewAgent")
 	jaeger.Spec.Agent.Strategy = "daemonset"
 	agent := NewAgent(jaeger)
-	assert.NotNil(t, agent.Get())
+
+	ds := agent.Get()
+	assert.NotNil(t, ds)
+
+	assert.Equal(t, "false", ds.Spec.Template.Annotations["sidecar.istio.io/inject"])
 }
diff --git a/pkg/deployment/all-in-one.go b/pkg/deployment/all-in-one.go
index 8e1ed681b..b9ae5b9f7 100644
--- a/pkg/deployment/all-in-one.go
+++ b/pkg/deployment/all-in-one.go
@@ -36,8 +36,9 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 	selector := a.selector()
 	trueVar := true
 	annotations := map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   "16686",
+		"prometheus.io/scrape":    "true",
+		"prometheus.io/port":      "16686",
+		"sidecar.istio.io/inject": "false",
 	}
 
 	return &appsv1.Deployment{
diff --git a/pkg/deployment/all-in-one_test.go b/pkg/deployment/all-in-one_test.go
index e16b89231..19fadc250 100644
--- a/pkg/deployment/all-in-one_test.go
+++ b/pkg/deployment/all-in-one_test.go
@@ -36,6 +36,8 @@ func TestDefaultAllInOneImage(t *testing.T) {
 		},
 	}
 	assert.Equal(t, envvars, d.Spec.Template.Spec.Containers[0].Env)
+
+	assert.Equal(t, "false", d.Spec.Template.ObjectMeta.Annotations["sidecar.istio.io/inject"])
 }
 
 func TestAllInOneHasOwner(t *testing.T) {
diff --git a/pkg/deployment/collector.go b/pkg/deployment/collector.go
index 00827d728..5a8347803 100644
--- a/pkg/deployment/collector.go
+++ b/pkg/deployment/collector.go
@@ -40,8 +40,9 @@ func (c *Collector) Get() *appsv1.Deployment {
 	trueVar := true
 	replicas := int32(c.jaeger.Spec.Collector.Size)
 	annotations := map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   "14268",
+		"prometheus.io/scrape":    "true",
+		"prometheus.io/port":      "14268",
+		"sidecar.istio.io/inject": "false",
 	}
 
 	return &appsv1.Deployment{
diff --git a/pkg/deployment/collector_test.go b/pkg/deployment/collector_test.go
index 2932f622b..79a6f722f 100644
--- a/pkg/deployment/collector_test.go
+++ b/pkg/deployment/collector_test.go
@@ -68,4 +68,6 @@ func TestDefaultCollectorImage(t *testing.T) {
 		},
 	}
 	assert.Equal(t, envvars, containers[0].Env)
+
+	assert.Equal(t, "false", dep.Spec.Template.ObjectMeta.Annotations["sidecar.istio.io/inject"])
 }
diff --git a/pkg/deployment/query.go b/pkg/deployment/query.go
index 736806b3f..e284a1b09 100644
--- a/pkg/deployment/query.go
+++ b/pkg/deployment/query.go
@@ -41,8 +41,9 @@ func (q *Query) Get() *appsv1.Deployment {
 	trueVar := true
 	replicas := int32(q.jaeger.Spec.Query.Size)
 	annotations := map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   "16686",
+		"prometheus.io/scrape":    "true",
+		"prometheus.io/port":      "16686",
+		"sidecar.istio.io/inject": "false",
 
 		// note that we are explicitly using a string here, not the value from `inject.Annotation`
 		// this has two reasons:
diff --git a/pkg/deployment/query_test.go b/pkg/deployment/query_test.go
index 2c54b3fe6..13b4c3c55 100644
--- a/pkg/deployment/query_test.go
+++ b/pkg/deployment/query_test.go
@@ -44,6 +44,8 @@ func TestDefaultQueryImage(t *testing.T) {
 
 	assert.Len(t, containers, 1)
 	assert.Equal(t, "org/custom-query-image:123", containers[0].Image)
+
+	assert.Equal(t, "false", dep.Spec.Template.ObjectMeta.Annotations["sidecar.istio.io/inject"])
 }
 
 func TestQueryPodName(t *testing.T) {