aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-02-14 17:27:42 +0100
committerAndreas Geissler <andreas-geissler@telekom.de>2023-02-17 09:47:09 +0100
commit2d7874249e98871ed13231f3bed8486c1e65e3aa (patch)
treeb8c9af76a8121a299c7faa34e5c45bce4e60dad8
parent63ec99de7215eb043093dd0e8ec90d8c33aa6590 (diff)
[DCAE][HVVES] Make HVVES collector SM compatible
As we have problems to send binary data to the HVVES collector the support for service appProtocol attribute is required to fix the hvves service protocol to "tcp" and to disable the port for sidecar usage Issue-ID: OOM-3076 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: Ied6ca4d4d8cd088c8ec0e0ee13068dfdbfb38461
-rw-r--r--kubernetes/common/common/templates/_service.tpl9
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml11
2 files changed, 18 insertions, 2 deletions
diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 20d2ebe260..4b6e0a1aae 100644
--- 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 f788ab0369..351998a725 100644
--- 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: