fix otel col compatible for kubernetes before 1.21

open-telemetry · Aug 21, 2023 · 87c18d4 · 87c18d4
1 parent a928378
commit 87c18d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl
@@ -151,11 +151,13 @@ Compute Service creation on mode
 Compute InternalTrafficPolicy on Service creation
 */}}
 {{- define "opentelemetry-collector.serviceInternalTrafficPolicy" }}
+{{- if (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}}
   {{- if and (eq .Values.mode "daemonset") (eq .Values.service.enabled true) }}
-    {{- print (.Values.service.internalTrafficPolicy | default "Local") -}}
+    {{- printf "internalTrafficPolicy: %s" (.Values.service.internalTrafficPolicy | default "Local") }}
   {{- else }}
-    {{- print (.Values.service.internalTrafficPolicy | default "Cluster") -}}
+    {{- printf "internalTrafficPolicy: %s" (.Values.service.internalTrafficPolicy | default "Cluster") }}
   {{- end }}
 {{- end -}}
+{{- end -}}
 
 
diff --git a/charts/opentelemetry-collector/templates/deployment.yaml b/charts/opentelemetry-collector/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
       dnsPolicy: {{ . }}
       {{- end }}
       {{- with .Values.dnsConfig }}
-      dnsConfig: 
+      dnsConfig:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- $podValues := deepCopy .Values }}

diff --git a/charts/opentelemetry-collector/templates/service.yaml b/charts/opentelemetry-collector/templates/service.yaml
@@ -34,7 +34,7 @@ spec:
   selector:
     {{- include "opentelemetry-collector.selectorLabels" . | nindent 4 }}
     {{- include "opentelemetry-collector.component" . | nindent 4 }}
-  internalTrafficPolicy: {{ include "opentelemetry-collector.serviceInternalTrafficPolicy" . }}
+  {{ include "opentelemetry-collector.serviceInternalTrafficPolicy" . | nindent 2 }}
   {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.externalTrafficPolicy) }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}