Allow upgrades

Author: dbudziwojskiNR

charts/nr-k8s-otel-collector/templates/_ports.tpl

@@ -1,23 +1,27 @@
 {{/* Build the list of port for the DaemonSet pods */}}
 {{- define "nrKubernetesOtel.daemonset.ports" -}}
+{{- if get .Values.daemonset "ports" | kindIs "map" -}}
 {{- $ports := deepCopy .Values.daemonset.ports -}}
 {{- range $key, $port := $ports }}
 {{- if $port.enabled }}
 - name: {{ $key }}
   containerPort: {{ $port.containerPort }}
   protocol: {{ $port.protocol }}
-{{- end}}
-{{- end }}
-{{- end }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{/* Build the list of port for the Deployment pod */}}
 {{- define "nrKubernetesOtel.deployment.ports" -}}
+{{- if get .Values.deployment "ports" | kindIs "map" -}}
 {{- $ports := deepCopy .Values.deployment.ports -}}
 {{- range $key, $port := $ports }}
 {{- if $port.enabled }}
 - name: {{ $key }}
   containerPort: {{ $port.containerPort }}
   protocol: {{ $port.protocol }}
-{{- end}}
-{{- end }}
-{{- end }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}

charts/nr-k8s-otel-collector/values.yaml

@@ -153,7 +153,6 @@ deployment:
     metrics:
       enabled: true
       containerPort: 8888
-      servicePort: 8888
       protocol: TCP
     http:
       enabled: true