minor changes

Signed-off-by: mehul <mehulsharam4786@gmail.com>
jaegertracing · Oct 20, 2024 · a16865c · a16865c
1 parent 774cc21
commit a16865c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/lint-test-v2.yaml b/.github/workflows/lint-test-v2.yaml
@@ -1,3 +1,5 @@
+name: Lint and Test Charts v2
+
 on: pull_request
 
 jobs:
@@ -67,4 +69,4 @@ jobs:
           cmctl check api --wait=5m
 
       - name: Run chart-testing (install)
-        run: ct install --debug --config ct.yaml --helm-extra-set-args "--set v2.enabled=true --set provisionDataStore.cassandra=false --set storage.type=memory --set allInOne.enabled=true --set agent.enabled=false --set collector.enabled=false --set query.enabled=false"
+        run: ct install --debug --config ct.yaml --helm-extra-set-args "--set v2.enabled=true --set provisionDataStore.cassandra=false --set storage.type=memory --set allInOne.enabled=true --set agent.enabled=false --set collector.enabled=false --set query.enabled=false" --helm-extra-args "--debug"
diff --git a/charts/jaeger/templates/allinone-configmap-v2.yaml b/charts/jaeger/templates/allinone-configmap-v2.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "jaeger-v2.fullname" . }}
+  name: jaeger-v2-configmap
   namespace: {{ include "jaeger-v2.namespace" . }}
   labels:
         {{- include "jaeger-v2.labels" . | nindent 4 }}

diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml
@@ -54,22 +54,22 @@ spec:
         {{- end }}
           securityContext:
             {{- toYaml .Values.allInOne.securityContext | nindent 12 }}
-          {{- if not .Values.v2.enabled }}
-          image: {{ include "allInOne.image" . }}
-          {{- end }}
           {{- if .Values.v2.enabled }}
           image: {{ .Values.v2.image }}
+          {{- else }}
+          image: {{ include "allInOne.image" . }}
           {{- end }}
           imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }}
           name: jaeger
           args:
           {{- if .Values.v2.enabled }}
             - "--config"
             - "/etc/jaeger/config.yaml"
-          {{- end -}}
+          {{- else }}
             {{- range $arg := .Values.allInOne.args }}
             - "{{ tpl $arg $ }}"
             {{- end }}
+          {{- end }}
           ports:
             - containerPort: 5775
               protocol: UDP
@@ -149,7 +149,7 @@ spec:
     {{- if .Values.v2.enabled }}
         - name: jaeger-v2-config
           configMap:
-            name: {{ include "jaeger-v2.fullname" . }}
+            name: jaeger-v2-configmap
     {{- end }}
     {{- if not .Values.storage.badger.ephemeral }}
         - name: badger-data