Merge "[AAI] Service Mesh compatibility"

diff --cc kubernetes/aai/components/aai-babel/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-graphadmin/values.yaml
index c29004e,ad6ef3c..89c4b02
--- 1/kubernetes/aai/components/aai-graphadmin/values.yaml
--- 2/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@@ -208,11 -203,10 +211,11 @@@ readiness
  service:
    type: ClusterIP
    # REST API port for the graphadmin microservice
-   portName: aai-graphadmin-8449
+   portName: http
    internalPort: 8449
-   portName2: aai-graphadmin-5005
+   portName2: tcp-5005
    internalPort2: 5005
 +  terminationGracePeriodSeconds: 120
  
  ingress:
    enabled: false

diff --cc kubernetes/aai/components/aai-modelloader/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-resources/values.yaml
index 2ec78c5,776f8be..e244e76
--- 1/kubernetes/aai/components/aai-resources/values.yaml
--- 2/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@@ -224,11 -219,10 +227,11 @@@ readiness
  
  service:
    type: ClusterIP
-   portName: aai-resources-8447
+   portName: http
    internalPort: 8447
-   portName2: aai-resources-5005
+   portName2: tcp-5005
    internalPort2: 5005
 +  terminationGracePeriodSeconds: 120
  
  ingress:
    enabled: false

diff --cc kubernetes/aai/components/aai-schema-service/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-sparky-be/values.yaml
Simple merge

diff --cc kubernetes/aai/components/aai-traversal/values.yaml
index 7ad9600,c1746be..fc4ff7a
--- 1/kubernetes/aai/components/aai-traversal/values.yaml
--- 2/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@@ -249,11 -241,10 +249,11 @@@ readiness
  
  service:
    type: ClusterIP
-   portName: aai-traversal-8446
+   portName: http
    internalPort: 8446
-   portName2: aai-traversal-5005
+   portName2: tcp-5005
    internalPort2: 5005
 +  terminationGracePeriodSeconds: 120
  
  ingress:
    enabled: false

diff --cc kubernetes/aai/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/values.yaml
Simple merge

diff --cc kubernetes/common/common/templates/_service.tpl
Simple merge