Merge "[AAI] Kiali Validation - KIA0601 - Port name must follow [-suffix] form"

7 files changed, 10 insertions, 8 deletions

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index d333448f8d..3e3d685ad8 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -195,7 +195,7 @@ service:
   internalPort: 8449
   portName2: tcp-5005
   internalPort2: 5005
-  portName3: aai-graphadmin-8448
+  portName3: http-aai-graphadmin
   internalPort3: 8448
   terminationGracePeriodSeconds: 120
 
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 0f09643bba..a966776054 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -197,7 +197,7 @@ service:
   internalPort: 8447
   portName2: tcp-5005
   internalPort2: 5005
-  portName3: aai-resources-8448
+  portName3: http-aai-resources
   internalPort3: 8448
   terminationGracePeriodSeconds: 120
   sessionAffinity: None
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index 9cf1d89946..106b44070c 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -220,7 +220,7 @@ service:
   internalPort: 8446
   portName2: tcp-5005
   internalPort2: 5005
-  portName3: aai-traversal-8448
+  portName3: http-aai-traversal
   internalPort3: 8448
   terminationGracePeriodSeconds: 120
   sessionAffinity: None
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 2c67da036d..58f172387c 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -365,7 +365,7 @@ service:
 
 metricsService:
   type: ClusterIP
-  portName: prometheus
+  portName: http-prometheus
   externalPort: 8448
   internalPort: 8448
 
diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 8742bdd4ce..ab0bafea5f 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -94,7 +94,7 @@ readiness:
 
 service:
   type: NodePort
-  portName: cds-ui
+  portName: http-cds-ui
   name: cds-ui
   nodePort: 97
   internalPort: 3000
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index a87bd52770..3e97c6765c 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -125,6 +125,8 @@ etcd:
   nameOverride: multicloud-k8s-etcd
   service:
     name: multicloud-k8s-etcd
+    clientPortName: tcp-etcd-client
+    peerPortName: tcp-etcd-server
   persistence:
     mountSubPath: multicloud-k8s/etcd/data
     enabled: true
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index b90c33766e..ce53abaf04 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -81,18 +81,18 @@ liveness:
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
-  port: a1pms-api
+  port: http-a1pms-api
 
 readiness:
   initialDelaySeconds: 20
   periodSeconds: 10
-  port: a1pms-api
+  port: http-a1pms-api
 
 service:
   type: ClusterIP
   name: *componentName
   ports:
-    - name: a1pms-api
+    - name: http-a1pms-api
       port: 8086
 
 flavor: small