From 61c8be6d77b37bb3a6fc12d5a755336f27ae15b0 Mon Sep 17 00:00:00 2001
From: Kevin Pollet <pollet.kevin@gmail.com>
Date: Fri, 21 Aug 2020 11:48:04 +0200
Subject: [PATCH] Remove init container used to wait for jaeger init

---
 helm/chart/maesh/Chart.yaml                      |  3 +--
 .../maesh/templates/mesh/mesh-daemonset.yaml     | 16 +---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/helm/chart/maesh/Chart.yaml b/helm/chart/maesh/Chart.yaml
index 68d6ae8ed..aab83e2aa 100644
--- a/helm/chart/maesh/Chart.yaml
+++ b/helm/chart/maesh/Chart.yaml
@@ -1,9 +1,9 @@
----
 apiVersion: v2
 name: maesh
 version: 2.1.2
 appVersion: v1.3.2
 description: Maesh - Simpler Service Mesh
+type: application
 keywords:
   - traefik
   - mesh
@@ -24,7 +24,6 @@ maintainers:
     email: harold@containo.us
   - name: kevinpollet
     email: kevin@containo.us
-engine: gotpl
 icon: https://raw.githubusercontent.com/containous/maesh/v1.2/docs/content/assets/img/maesh.png
 dependencies:
   - name: tracing
diff --git a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml
index d5a2ce5cb..8bd9c0fd7 100644
--- a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml
+++ b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml
@@ -51,21 +51,6 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
       {{- end }}
-      {{- if .Values.tracing.deploy }}
-      initContainers:
-        - name: wait-for-jaeger-init
-          image: groundnuty/k8s-wait-for:v1.3
-          args:
-            - "service"
-            - "-lapp.kubernetes.io/name=jaeger,app.kubernetes.io/component=agent"
-          resources:
-            requests:
-              memory: "10Mi"
-              cpu: "50m"
-            limits:
-              memory: "20Mi"
-              cpu: "100m"
-      {{- end }}
       containers:
         - name: maesh-mesh
           image: {{ include "maesh.meshImage" . | quote }}
@@ -110,6 +95,7 @@ spec:
               {{- else }}
             - {{ printf "--tracing.jaeger.samplingServerURL=http://jaeger-agent.%s.svc.%s:5778/sampling" .Release.Namespace (default "cluster.local" .Values.clusterDomain) | quote }}
               {{- end }}
+            - "--tracing.jaeger.disableAttemptReconnecting=false"
             {{- end }}
             {{- if .Values.tracing.datadog }}
               {{- if .Values.tracing.datadog.localagenthostport }}