[jaeger] Add appProtocol #539 (#540)

Add appProtocol

Signed-off-by: Antonio Berben <antonio.berben@solo.io>

Author: antonioberben

charts/jaeger/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 1.0.1
+version: 1.0.2
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:

charts/jaeger/templates/allinone-collector-svc.yaml

@@ -12,21 +12,36 @@ spec:
     - name: http-zipkin
       port: 9411
       targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
     - name: grpc-http
       port: 14250
       targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: grpc
+      {{- end }}
     - name: c-tchan-trft
       port: 14267
       targetPort: 0
     - name: http-c-binary-trft
       port: 14268
       targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
     - name: {{ .Values.allInOne.service.collector.otlp.grpc.name }}
       port: 4317
       targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: grpc
+      {{- end }}
     - name: {{ .Values.allInOne.service.collector.otlp.http.name }}
       port: 4318
       targetPort: 0
+      {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+      appProtocol: http
+      {{- end }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: all-in-one

charts/jaeger/templates/collector-svc.yaml

@@ -19,13 +19,19 @@ spec:
 {{- end }}
     protocol: TCP
     targetPort: grpc
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: grpc
+    {{- end }}
   - name: http
     port: {{ .Values.collector.service.http.port }}
 {{- if and (eq .Values.collector.service.type "NodePort") (.Values.collector.service.http.nodePort) }}
     nodePort: {{ .Values.collector.service.http.nodePort }}
 {{- end }}
     protocol: TCP
     targetPort: http
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: http
+    {{- end }}
 {{- if .Values.collector.service.zipkin }}
   - name: zipkin
     port: {{ .Values.collector.service.zipkin.port }}
@@ -34,6 +40,9 @@ spec:
 {{- end }}
     protocol: TCP
     targetPort: zipkin
+    {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+    appProtocol: http
+    {{- end }}
 {{- end }}
 {{- if or .Values.collector.service.otlp.grpc .Values.collector.service.otlp.http }}
   - name: {{ .Values.collector.service.otlp.grpc.name }}