Merge "[DCAE][HVVES] Make HVVES collector SM compatible"

diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 20d2ebe..4b6e0a1 100644 (file)
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -126,6 +126,9 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent
 {{-       else }}
   protocol: TCP
 {{-       end }}
+{{-       if $port.app_protocol }}
+  appProtocol: {{ $port.app_protocol }}
+{{-       end }}
 {{-       if $port.port_protocol }}
   name: {{ printf "%ss-%s" $port.port_protocol $port.name }}
 {{-       else }}
@@ -139,6 +142,9 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent
 {{-       else }}
   protocol: {{ default "TCP" $port.l4_protocol  }}
 {{-       end }}
+{{-       if $port.app_protocol }}
+  appProtocol: {{ $port.app_protocol }}
+{{-       end }}
 {{-       if $port.port_protocol }}
   name: {{ printf "%s-%s" $port.port_protocol $port.name }}
 {{-       else }}
@@ -157,6 +163,9 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent
 {{-         else }}
   protocol: {{ default "TCP" $port.l4_protocol  }}
 {{-         end }}
+{{-       if $port.app_protocol }}
+  appProtocol: {{ $port.app_protocol }}
+{{-       end }}
 {{-         if $port.port_protocol }}
   name: {{ printf "%s-%s" $port.port_protocol $port.name }}
 {{-         else }}

diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
index f788ab0..351998a 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -103,14 +103,21 @@ readiness:
   command:
   - /opt/ves-hv-collector/healthcheck.sh
 
+# since there are problems receiving binary data via the sidecar
+# the service port is excluded in the sidecar processing
+podAnnotations:
+  traffic.sidecar.istio.io/excludeInboundPorts: "6061"
+  traffic.sidecar.istio.io/includeInboundPorts: '*'
+
 # service configuration
 service:
   type: NodePort
   name: dcae-hv-ves-collector
   ports:
-    - name: http
+    - name: tcp
       port: 6061
-      port_protocol: http
+      port_protocol: tcp
+      app_protocol: tcp
       nodePort: 22
 
 ingress: