X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcharts%2Faai-resources%2Ftemplates%2Fdeployment.yaml;h=cac8f4b89fde7c70725040f84f0361a04065d7c0;hb=42f5651de0c3c634056b499aeb2ccf12a9039597;hp=8d7b7402768f46f4f1779f69eea7554b430bca43;hpb=94363e1c6343e093bd6fa6ada854243bb8d7e1a6;p=oom.git

diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 8d7b740276..cac8f4b89f 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -70,6 +70,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/cloud-infrastructure"
           },
+          {
+              "serviceName": "_aai-cloudInfrastructure",
+              "version": "v14",
+              "url": "/aai/v14/cloud-infrastructure",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/cloud-infrastructure"
+          },
           {
               "serviceName": "_aai-business",
               "version": "v11",
@@ -103,6 +114,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/business"
           },
+          {
+              "serviceName": "_aai-business",
+              "version": "v14",
+              "url": "/aai/v14/business",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/business"
+          },
           {
               "serviceName": "_aai-actions",
               "version": "v11",
@@ -136,6 +158,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/actions"
           },
+          {
+              "serviceName": "_aai-actions",
+              "version": "v14",
+              "url": "/aai/v14/actions",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/actions"
+          },
           {
               "serviceName": "_aai-service-design-and-creation",
               "version": "v11",
@@ -169,6 +202,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/service-design-and-creation"
           },
+          {
+              "serviceName": "_aai-service-design-and-creation",
+              "version": "v14",
+              "url": "/aai/v14/service-design-and-creation",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/service-design-and-creation"
+          },
           {
               "serviceName": "_aai-network",
               "version": "v11",
@@ -202,6 +246,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/network"
           },
+          {
+              "serviceName": "_aai-network",
+              "version": "v14",
+              "url": "/aai/v14/network",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/network"
+          },
           {
               "serviceName": "_aai-externalSystem",
               "version": "v11",
@@ -212,7 +267,7 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1",
               "path": "/aai/v11/external-system"
-          },      
+          },
           {
               "serviceName": "_aai-externalSystem",
               "version": "v12",
@@ -223,7 +278,7 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1",
               "path": "/aai/v12/external-system"
-          },      
+          },
           {
               "serviceName": "_aai-externalSystem",
               "version": "v13",
@@ -235,6 +290,17 @@ spec:
               "visualRange": "1",
               "path": "/aai/v13/external-system"
           },
+          {
+              "serviceName": "_aai-externalSystem",
+              "version": "v14",
+              "url": "/aai/v14/external-system",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1",
+              "path": "/aai/v14/external-system"
+          },
           {
               "serviceName": "aai-cloudInfrastructure",
               "version": "v11",
@@ -265,6 +331,16 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1"
           },
+          {
+              "serviceName": "aai-cloudInfrastructure",
+              "version": "v14",
+              "url": "/aai/v14/cloud-infrastructure",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          },
           {
               "serviceName": "aai-business",
               "version": "v11",
@@ -295,6 +371,16 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1"
           },
+          {
+              "serviceName": "aai-business",
+              "version": "v14",
+              "url": "/aai/v14/business",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          },
           {
               "serviceName": "aai-actions",
               "version": "v11",
@@ -325,6 +411,16 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1"
           },
+          {
+              "serviceName": "aai-actions",
+              "version": "v14",
+              "url": "/aai/v14/actions",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          },
           {
               "serviceName": "aai-service-design-and-creation",
               "version": "v11",
@@ -355,6 +451,16 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1"
           },
+          {
+              "serviceName": "aai-service-design-and-creation",
+              "version": "v14",
+              "url": "/aai/v14/service-design-and-creation",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          },
           {
               "serviceName": "aai-network",
               "version": "v11",
@@ -385,6 +491,16 @@ spec:
               "lb_policy":"ip_hash",
               "visualRange": "1"
           },
+          {
+              "serviceName": "aai-network",
+              "version": "v14",
+              "url": "/aai/v14/network",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
+          },
           {
               "serviceName": "aai-externalSystem",
               "version": "v11",
@@ -394,7 +510,7 @@ spec:
               "enable_ssl": true,
               "lb_policy":"ip_hash",
               "visualRange": "1"
-          },      
+          },
           {
               "serviceName": "aai-externalSystem",
               "version": "v12",
@@ -404,7 +520,7 @@ spec:
               "enable_ssl": true,
               "lb_policy":"ip_hash",
               "visualRange": "1"
-          },      
+          },
           {
               "serviceName": "aai-externalSystem",
               "version": "v13",
@@ -414,6 +530,16 @@ spec:
               "enable_ssl": true,
               "lb_policy":"ip_hash",
               "visualRange": "1"
+          },
+          {
+              "serviceName": "aai-externalSystem",
+              "version": "v14",
+              "url": "/aai/v14/external-system",
+              "protocol": "REST",
+              "port": "8447",
+              "enable_ssl": true,
+              "lb_policy":"ip_hash",
+              "visualRange": "1"
           }
           ]'
     spec:
@@ -515,7 +641,7 @@ spec:
           name: {{ include "common.fullname" . }}-aaf-certs
           subPath: org.onap.aai.p12
         - mountPath: /opt/app/aai-resources/resources/aaf/truststoreONAPall.jks
-          name: {{ include "common.fullname" . }}-aaf-certs
+          name: aai-common-aai-auth-mount
           subPath: truststoreONAPall.jks
         - mountPath: /opt/app/aai-resources/resources/application.properties
           name: {{ include "common.fullname" . }}-springapp-conf
@@ -647,6 +773,9 @@ spec:
     {{ end }}
 
       volumes:
+      - name: aai-common-aai-auth-mount
+        secret:
+          secretName: aai-common-aai-auth
       - name: localtime
         hostPath:
           path: /etc/localtime