Jaeger v2 with v1

[hellspawn679]

What this PR does

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format,
will close that issue when PR gets merged)

• fixes #

Checklist

• DCO signed
• Commits are GPG signed
• Chart Version bumped
• Title of the PR starts with chart name ([jaeger] or [jaeger-operator])
• README.md has been updated to match version/contain new values

[yurishkuro]

I don't like how you are mixing the OTEL config sections with chart sections like provisionDataStore. Is it possible to wrap the config under parent config: element?

[yurishkuro]

--set v2.enabled=true left over?

[hellspawn679]

oh i changes v2 to jaeger will fix it now

[yurishkuro]

we already discussed this - all these settings are already present in the chart without the v2 name, so please use the existing ones. I don't think there should be any properties / templates that have v2 in the name

[yurishkuro]

these can be inlined directly in the template, they provide no value

[yurishkuro]

why is this deleted? all-in-one is still a valid deployment and will need a ServiceAccount

[yurishkuro]

why do we need to rename all these files? Please keep the same names - there should be no files with v2 in the name.

[yurishkuro]

maybe go to 4.x? It's not backwards compatible with chart-3.x which only works with jaeger-v1

[yurishkuro]

is this much whitespace on the left expected? Could we use normal indentation

  labels:
    {{- include "jaeger.labels" . | nindent 4 }}

[hellspawn679]

could you explain what do yo mean by "normal indentation" i used this format because that is how labels are indented thought-out the chart

[yurishkuro]

I showed example

[hellspawn679]

oh got it will fix it

[yurishkuro]

I think this file should be called user-config.yaml, it's not specific to all-in-one.

[hellspawn679]

i used that only in the start but I got this error
Error: INSTALLATION FAILED: parse error at (jaeger/templates/allInOne-config.yaml:1): bad character U+002D '-'
the problem is helm chart don't allow '-' there is workaround we can use
{{index .Values.user-config }}
but with if or any other condition statements it throw this error
Error: INSTALLATION FAILED: parse error at (jaeger/templates/allInOne-config.yaml:1): unexpected <if> in operand

[yurishkuro]

I made this change to the template

diff --git a/charts/jaeger/templates/allInOne-config.yaml b/charts/jaeger/templates/allInOne-config.yaml
index eca21f2..e473618 100644
--- a/charts/jaeger/templates/allInOne-config.yaml
+++ b/charts/jaeger/templates/allInOne-config.yaml
@@ -8,5 +8,5 @@ metadata:
     {{- include "jaeger.labels" . | nindent 4 }}
 data:
   config.yaml: |
-        {{ .Values.userconfig | nindent 8 }}
+        {{- .Values.userconfig | nindent 4 }}
 {{- end }}

created mock config file

$ cat myconfig.yaml
hello:
  world: true

and ran a test

$ helm template --set-file userconfig=myconfig.yaml charts/jaeger > test-output.txt

which resulted in reasonably looking resource file:

# Source: jaeger/templates/allInOne-config.yaml
apiVersion: v1
kind: ConfigMap
metadata:
  name: jaeger-configmap
  namespace: default
  labels:
    helm.sh/chart: jaeger-4.0.0
    app.kubernetes.io/name: jaeger
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "2.0.0-rc2"
    app.kubernetes.io/managed-by: Helm
data:
  config.yaml: |
    hello:
      world: true

[yurishkuro]

please clean-up all the naming. Not jaeger-config, not jaeger-configmap, not allInOne-config.yaml, not config.yaml - everything should be using a single name user-config

[hellspawn679]

done should i convert it to PR

[yurishkuro]

I merged changes from main into v2, let's resolve conflicts

[yurishkuro]

this line is hard to read, please use the same formatting as in the deleted sections, one flag per line

[yurishkuro]

please delete empty es.txt

[yurishkuro]

Suggested change

	test-with-allInOne:
	test-with-all-in-one:

[yurishkuro]

couple small things, ready to merge otherwise