From: Lusheng Ji <lji@research.att.com>
Date: Fri, 29 May 2020 17:41:41 +0000 (+0000)
Subject: Merge "Enable https port"
X-Git-Tag: f-release~102
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2047196f688aa19a83dc1e68c5f12d2933d92bc9;hp=-c;p=it%2Fdep.git

Merge "Enable https port"
---

2047196f688aa19a83dc1e68c5f12d2933d92bc9
diff --combined nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 77582e51,76025042..6231bd92
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@@ -32,22 -32,11 +32,22 @@@ a1controller
      image:
        registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
        name: nonrtric-a1-controller
 -      tag: 1.7.4
 +      tag: 1.7.5
      replicaCount: 1
      service:
 -      internalPort: 8181
 -      externalPort: 8282
 +      allowHttp: true
 +      httpName: http
 +      internalPort1: 8282
 +      targetPort1: 8181
 +      httpsName: https
 +      internalPort2: 8383
 +      targetPort2: 8443
 +    liveness:
 +      initialDelaySeconds: 60
 +      periodSeconds: 10
 +    readiness:
 +      initialDelaySeconds: 60
 +      periodSeconds: 10
  
  a1simulator:
    a1simulator:
@@@ -77,8 -66,21 +77,21 @@@ controlpanel
        tag: 1.0.0
      replicaCount: 1
      service:
-       internalPort: 8080
-       externalPort: 30090
+       allowHttp: true
+       httpName: http
+       internalPort1: 8080
+       targetPort1: 8080
+       externalPort1: 30091
+       httpsName: https
+       internalPort2: 8081
+       targetPort2: 8082
+       externalPort2: 30092
+     liveness:
+       initialDelaySeconds: 20
+       periodSeconds: 10
+     readiness:
+       initialDelaySeconds: 20
+       periodSeconds: 10
  
  # Need to check the external port Availability
  policymanagementservice:
@@@ -89,5 -91,18 +102,18 @@@
        name: nonrtric-policy-agent
        tag: 1.0.0
      service:
-       internalPort: 8081
-       externalPort: 30091
+       allowHttp: true
+       httpName: http
+       internalPort1: 9080
+       targetPort1: 8081
+       externalPort1: 30093
+       httpsName: https
+       internalPort2: 9081
+       targetPort2: 8433
+       externalPort2: 30094
+     liveness:
+       initialDelaySeconds: 20
+       periodSeconds: 10
+     readiness:
+       initialDelaySeconds: 20
+       periodSeconds: 10