diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-02-19 00:32:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-02-19 00:32:43 +0000 |
| commit | 0460cfce31a204cada6a202fd86515ca4fbbb113 (patch) | |
| tree | 92fc403a9cce30099ebd2c58e747cab1c41439ae | |
| parent | 1a66ef933641fa4c28332a62f15e95d6447af8b8 (diff) | |
| parent | 2d7874249e98871ed13231f3bed8486c1e65e3aa (diff) | |
Merge "[DCAE][HVVES] Make HVVES collector SM compatible"
| -rw-r--r-- | kubernetes/common/common/templates/_service.tpl | 9 | ||||
| -rw-r--r-- | kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml | 11 |
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: |