Check if annotation sidecar.istio.io/inject exists

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>
jaegertracing · Apr 19, 2022 · 4e33d89 · 4e33d89
1 parent 6126133
commit 4e33d89
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/pkg/deployment/all_in_one.go b/pkg/deployment/all_in_one.go
@@ -63,7 +63,10 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 	for k, v := range commonSpec.Annotations {
 		podAnnotations[k] = v
 	}
-	podAnnotations["sidecar.istio.io/inject"] = "false"
+	_, ok := podAnnotations["sidecar.istio.io/inject"]
+	if !ok {
+		podAnnotations["sidecar.istio.io/inject"] = "false"
+	}
 
 	options := allArgs(a.jaeger.Spec.AllInOne.Options,
 		a.jaeger.Spec.Storage.Options.Filter(a.jaeger.Spec.Storage.Type.OptionsPrefix()))
@@ -124,7 +127,7 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 			Name:        a.jaeger.Name,
 			Namespace:   a.jaeger.Namespace,
 			Labels:      commonSpec.Labels,
-			Annotations: commonSpec.Annotations,
+			Annotations: baseCommonSpec.Annotations,
 			OwnerReferences: []metav1.OwnerReference{{
 				APIVersion: a.jaeger.APIVersion,
 				Kind:       a.jaeger.Kind,

diff --git a/pkg/deployment/collector.go b/pkg/deployment/collector.go
@@ -58,7 +58,10 @@ func (c *Collector) Get() *appsv1.Deployment {
 	for k, v := range commonSpec.Annotations {
 		podAnnotations[k] = v
 	}
-	podAnnotations["sidecar.istio.io/inject"] = "false"
+	_, ok := podAnnotations["sidecar.istio.io/inject"]
+	if !ok {
+		podAnnotations["sidecar.istio.io/inject"] = "false"
+	}
 
 	var envFromSource []corev1.EnvFromSource
 	if len(c.jaeger.Spec.Storage.SecretName) > 0 {
@@ -113,7 +116,7 @@ func (c *Collector) Get() *appsv1.Deployment {
 			Name:        c.name(),
 			Namespace:   c.jaeger.Namespace,
 			Labels:      commonSpec.Labels,
-			Annotations: commonSpec.Annotations,
+			Annotations: baseCommonSpec.Annotations,
 			OwnerReferences: []metav1.OwnerReference{{
 				APIVersion: c.jaeger.APIVersion,
 				Kind:       c.jaeger.Kind,

diff --git a/pkg/deployment/ingester.go b/pkg/deployment/ingester.go
@@ -64,7 +64,10 @@ func (i *Ingester) Get() *appsv1.Deployment {
 	for k, v := range commonSpec.Annotations {
 		podAnnotations[k] = v
 	}
-	podAnnotations["sidecar.istio.io/inject"] = "false"
+	_, ok := podAnnotations["sidecar.istio.io/inject"]
+	if !ok {
+		podAnnotations["sidecar.istio.io/inject"] = "false"
+	}
 
 	var envFromSource []corev1.EnvFromSource
 	if len(i.jaeger.Spec.Storage.SecretName) > 0 {

diff --git a/pkg/deployment/query.go b/pkg/deployment/query.go
@@ -67,7 +67,10 @@ func (q *Query) Get() *appsv1.Deployment {
 	for k, v := range commonSpec.Annotations {
 		podAnnotations[k] = v
 	}
-	podAnnotations["sidecar.istio.io/inject"] = "false"
+	_, ok := podAnnotations["sidecar.istio.io/inject"]
+	if !ok {
+		podAnnotations["sidecar.istio.io/inject"] = "false"
+	}
 
 	options := allArgs(q.jaeger.Spec.Query.Options,
 		q.jaeger.Spec.Storage.Options.Filter(q.jaeger.Spec.Storage.Type.OptionsPrefix()))
@@ -110,7 +113,7 @@ func (q *Query) Get() *appsv1.Deployment {
 			Name:        fmt.Sprintf("%s-query", q.jaeger.Name),
 			Namespace:   q.jaeger.Namespace,
 			Labels:      commonSpec.Labels,
-			Annotations: commonSpec.Annotations,
+			Annotations: baseCommonSpec.Annotations,
 			OwnerReferences: []metav1.OwnerReference{{
 				APIVersion: q.jaeger.APIVersion,
 				Kind:       q.jaeger.Kind,