NONRTRIC-946: Servicemanager - Add Kong data plane and control plane

Change-Id: I5ba03381a2ceb40738779e09f92b654a8ed94737
Signed-off-by: DenisGNoonan <denis.noonan@est.tech>

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 1a67607..d557e53 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -387,7 +387,7 @@ servicemanager:
     image:
       registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
       name: nonrtric-plt-servicemanager
     image:
       registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
       name: nonrtric-plt-servicemanager

-      tag: 0.1.1
+      tag: 0.1.2

 
 rappmanager:
   rappmanager:
 
 rappmanager:
   rappmanager:

diff --git a/nonrtric/helm/servicemanager/values.yaml b/nonrtric/helm/servicemanager/values.yaml
index 7a36304..dbb261c 100644 (file)
--- a/nonrtric/helm/servicemanager/values.yaml
+++ b/nonrtric/helm/servicemanager/values.yaml
@@ -21,7 +21,7 @@ servicemanager:
   image:
     registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
     name: nonrtric-plt-servicemanager
   image:
     registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
     name: nonrtric-plt-servicemanager

-    tag: 0.1.1
+    tag: 0.1.2

   apiVersion: v1
   kind: ConfigMap
   metadataName: servicemanager-configmap
   apiVersion: v1
   kind: ConfigMap
   metadataName: servicemanager-configmap


@@ -36,13 +36,17 @@ servicemanager:
 
 data:
   .env: |
 
 data:
   .env: |

+    # The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
+    # In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
+    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local.

     KONG_DOMAIN: "kong"
     KONG_PROTOCOL: "http"
     KONG_DOMAIN: "kong"
     KONG_PROTOCOL: "http"

-    KONG_IPV4: "kong-nonrtric-kong-admin.nonrtric.svc.cluster.local"
-    KONG_DATA_PLANE_PORT: "80"
+    KONG_CONTROL_PLANE_IPV4: "kong-nonrtric-kong-admin.nonrtric.svc.cluster.local"

     KONG_CONTROL_PLANE_PORT: "8001"
     KONG_CONTROL_PLANE_PORT: "8001"

+    KONG_DATA_PLANE_IPV4: "kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
+    KONG_DATA_PLANE_PORT: "80"

     CAPIF_PROTOCOL: "http"
     CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"
     CAPIF_PORT: "8090"
     CAPIF_PROTOCOL: "http"
     CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"
     CAPIF_PORT: "8090"

-    LOG_LEVEL: "Debug"
+    LOG_LEVEL: "Info"

     SERVICE_MANAGER_PORT: "8095"
     SERVICE_MANAGER_PORT: "8095"