From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Wed, 9 Sep 2020 11:14:27 +0000 (+0200)
Subject: [Tree-Wide] Reference ports by name not index
X-Git-Tag: 7.0.0~250^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=28d372ab210e4bf053b1dd49dfed443096959000;p=oom.git

[Tree-Wide] Reference ports by name not index

Referencing anything based on its position on alist can be really
fragile and har to debug. As we already have a convenience template
that allows us to access the port based on its name let's make sure
that everyone is using it.

Issue-ID: OOM-1971
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Id25cb9d9e48f39f46786ea9e9a432b0c51130c50
---

diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
index 64268abb33..28d974c815 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/templates/deployment.yaml
@@ -36,13 +36,13 @@ spec:
           {{- if eq .Values.liveness.enabled true }}
           livenessProbe:
             tcpSocket:
-              port: {{ ( index .Values.service.ports 0).port }}
+              port: {{ include "common.getPort" (dict "global" . "name" "http") }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
           {{ end -}}
           readinessProbe:
             tcpSocket:
-              port: {{ ( index .Values.service.ports 0).port }}
+              port: {{ include "common.getPort" (dict "global" . "name" "http") }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
diff --git a/kubernetes/so/charts/so-ve-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
index 88d805d81e..89b6ada3fd 100755
--- a/kubernetes/so/charts/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 server:
-  port: {{ (index .Values.service.ports 0).port }}
+  port: {{ include "common.getPort" (dict "global" . "name" "http") }}
 
 vevnfmadapter:
   endpoint: https://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
diff --git a/kubernetes/so/charts/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/charts/so-ve-vnfm-adapter/values.yaml
index d244f7abf5..0620a0b052 100755
--- a/kubernetes/so/charts/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/charts/so-ve-vnfm-adapter/values.yaml
@@ -50,7 +50,7 @@ service:
           "version": "v1",
           "url": "/",
           "protocol": "REST",
-          "port": "{{ (index .Values.service.ports 0).port }}",
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http") }}",
           "visualRange": "1"
         }
       ]{{ end }}