Fix helm chart test using scope for otelTracing

kubernetes-sigs · Aug 14, 2023 · b676dba · b676dba
1 parent 3e3d309
commit b676dba
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -93,7 +93,7 @@ spec:
             {{- with .Values.controller.userAgentExtra }}
             - --user-agent-extra={{ . }}
             {{- end }}
-            {{- if .Values.controller.otelTracing.enabled }}
+            {{- if .Values.controller.otelTracing }}
             - --enable-otel-tracing=true
             {{- end}}
             - --v={{ .Values.controller.logLevel }}
@@ -137,11 +137,11 @@ spec:
             {{- with .Values.controller.env }}
             {{- . | toYaml | nindent 12 }}
             {{- end }}
-            {{- if .Values.controller.otelTracing.enabled }}
+            {{- with .Values.controller.otelTracing }}
             - name: OTEL_SERVICE_NAME
-              value: {{ .Values.controller.otelTracing.otelServiceName }}
+              value: {{ .otelServiceName }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: {{ .Values.controller.otelTracing.otelExporterEndpoint }}
+              value: {{ .otelExporterEndpoint }}
             {{- end }}
           {{- with .Values.controller.envFrom }}
           envFrom:

diff --git a/charts/aws-ebs-csi-driver/templates/node-windows.yaml b/charts/aws-ebs-csi-driver/templates/node-windows.yaml
@@ -58,7 +58,7 @@ spec:
             - --logging-format={{ . }}
             {{- end }}
             - --v={{ .Values.node.logLevel }}
-            {{- if .Values.node.otelTracing.enabled }}
+            {{- if .Values.node.otelTracing }}
             - --enable-otel-tracing=true
             {{- end}}
           env:
@@ -71,11 +71,11 @@ spec:
             {{- if .Values.proxy.http_proxy }}
             {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
             {{- end }}
-            {{- if .Values.node.otelTracing.enabled }}
+            {{- with .Values.node.otelTracing }}
             - name: OTEL_SERVICE_NAME
-              value: {{ .Values.node.otelTracing.otelServiceName }}
+              value: {{ .otelServiceName }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: {{ .Values.node.otelTracing.otelExporterEndpoint }}
+              value: {{ .otelExporterEndpoint }}
             {{- end }}
             {{- with .Values.node.env }}
             {{- . | toYaml | nindent 12 }}

diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -64,7 +64,7 @@ spec:
             - --logging-format={{ . }}
             {{- end }}
             - --v={{ .Values.node.logLevel }}
-            {{- if .Values.node.otelTracing.enabled }}
+            {{- if .Values.node.otelTracing }}
             - --enable-otel-tracing=true
             {{- end}}
           env:
@@ -77,11 +77,11 @@ spec:
             {{- if .Values.proxy.http_proxy }}
             {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }}
             {{- end }}
-            {{- if .Values.node.otelTracing.enabled }}
+            {{- with .Values.node.otelTracing }}
             - name: OTEL_SERVICE_NAME
-              value: {{ .Values.node.otelTracing.otelServiceName }}
+              value: {{ .otelServiceName }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: {{ .Values.node.otelTracing.otelExporterEndpoint }}
+              value: {{ .otelExporterEndpoint }}
             {{- end }}
             {{- with .Values.node.env }}
             {{- . | toYaml | nindent 12 }}

diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
@@ -288,10 +288,10 @@ controller:
   # - name: wait
   #   image: busybox
   #   command: [ 'sh', '-c', "sleep 20" ]
-  otelTracing:
-    enabled: false
-    otelServiceName: ebs-csi-controller
-    otelExporterEndpoint: "http://localhost:4317"
+  # Enable opentelemetry tracing for the plugin running on the daemonset
+  otelTracing: {}
+  #  otelServiceName: ebs-csi-controller
+  #  otelExporterEndpoint: "http://localhost:4317"
 
 node:
   env: []
@@ -358,10 +358,10 @@ node:
   containerSecurityContext:
     readOnlyRootFilesystem: true
     privileged: true
-  otelTracing:
-    enabled: false
-    otelServiceName: ebs-csi-node
-    otelExporterEndpoint: "http://localhost:4317"
+  # Enable opentelemetry tracing for the plugin running on the daemonset
+  otelTracing: {}
+  #  otelServiceName: ebs-csi-node
+  #  otelExporterEndpoint: "http://localhost:4317"
 
 storageClasses: []
 # Add StorageClass resources like: