fix: Addressing more comments

lightstep · Feb 23, 2024 · d1cc8e2 · d1cc8e2
1 parent 672c780
commit d1cc8e2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/charts/kube-otel-stack/templates/autoinstrumentation.yaml b/charts/kube-otel-stack/templates/autoinstrumentation.yaml
@@ -6,28 +6,32 @@ metadata:
 spec:
   exporter:
     endpoint: http://{{ $.Release.Name }}-{{ .Values.autoinstrumentation.collectorTarget }}-collector.{{ $.Release.Namespace }}:4317
-  propagators: {{ toYaml .Values.autoinstrumentation.propagators | nindent 4 }}
+  propagators:
+{{ toYaml .Values.autoinstrumentation.propagators | nindent 4 }}
   {{- with .Values.autoinstrumentation.sampler }}
-  sampler: {{ toYaml . | nindent 4 }}
+  sampler:
+{{ toYaml . | indent 4 }}
   {{- end }}
   {{- with .Values.autoinstrumentation.env }}
-  env: {{ toYaml . | nindent 4 }}
+  env:
+{{ toYaml . | indent 4 }}
   {{- end }}
   {{- with .Values.autoinstrumentation.resource }}
-  resource: {{ toYaml . | nindent 4 }}
+  resource:
+{{ toYaml . | indent 4 }}
   {{- end }}
   {{- range $language, $settings := .Values.autoinstrumentation.languagesettings }}
-    {{- with $settings }}
   {{$language}}:
-    {{- with .env }}
-    env: {{ toYaml . | nindent 6 }}
+    {{- with $settings.env }}
+    env:
+{{ toYaml . | indent 6 }}
     {{- end }}
-    {{- if .image }}
-    image: {{ .image | quote }}
-    {{- end }}
-    {{- with .resources }}
-    resources: {{ toYaml . | nindent 6 }}
+    {{- if $settings.image }}
+    image: {{ $settings.image | quote }}
     {{- end }}
+    {{- with $settings.resources }}
+    resources:
+{{ toYaml . | indent 6 }}
     {{- end }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/kube-otel-stack/values.yaml b/charts/kube-otel-stack/values.yaml
@@ -37,9 +37,9 @@ autoinstrumentation:
     # python:
     #   env:
     #     - name: OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED
-    #       value: 'true'
+    #       value: "true"
     #     - name: OTEL_TRACES_EXPORTER
-    #       value: otlp
+    #       value: "otlp"
     #   image: "<custom-image>"
     #   resources: {}
   ## A list of corev1.EnvVars