From e5a6ed0aa2e296561249541ee57fe8b4ed55a290 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Fri, 29 May 2020 11:30:58 +0200 Subject: [PATCH] Enable https in nonrtric A1 simulator Change-Id: I2db86e499cc345fa11c2a346afc189821f9f7b45 Issue-ID: NONRTRIC-232 Signed-off-by: RehanRaza --- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 13 +++++++++- nonrtric/helm/a1simulator/templates/service.yaml | 12 ++++++--- .../helm/a1simulator/templates/statefulset.yaml | 30 ++++++++++++++++------ nonrtric/helm/a1simulator/values.yaml | 13 +++++++++- .../config/application_configuration.json | 4 +-- 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 4a7d3f0b..a13d2c92 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -47,7 +47,18 @@ a1simulator: name: a1-simulator tag: 1.0.1 service: - internalPort: 8085 + httpName: http + internalPort1: 8085 + targetPort1: 8085 + httpsName: https + internalPort2: 8185 + targetPort2: 8185 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 oscVersion: name: a1-sim-osc replicaCount: 2 diff --git a/nonrtric/helm/a1simulator/templates/service.yaml b/nonrtric/helm/a1simulator/templates/service.yaml index 616595f9..d22654c9 100644 --- a/nonrtric/helm/a1simulator/templates/service.yaml +++ b/nonrtric/helm/a1simulator/templates/service.yaml @@ -26,10 +26,14 @@ metadata: heritage: {{ .Release.Service }} spec: ports: - - name: http - protocol: TCP - port: {{ .Values.a1simulator.service.internalPort }} - targetPort: {{ .Values.a1simulator.service.internalPort }} + - name: {{ index .Values.a1simulator.service.httpName }} + port: {{ .Values.a1simulator.service.internalPort1 }} + targetPort: {{ .Values.a1simulator.service.targetPort1 }} + protocol: TCP + - name: {{ index .Values.a1simulator.service.httpsName }} + port: {{ .Values.a1simulator.service.internalPort2 }} + targetPort: {{ .Values.a1simulator.service.targetPort2 }} + protocol: TCP selector: app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} release: {{ .Release.Name }} diff --git a/nonrtric/helm/a1simulator/templates/statefulset.yaml b/nonrtric/helm/a1simulator/templates/statefulset.yaml index 865e2ca0..d6dc0b30 100644 --- a/nonrtric/helm/a1simulator/templates/statefulset.yaml +++ b/nonrtric/helm/a1simulator/templates/statefulset.yaml @@ -46,13 +46,20 @@ spec: image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }} imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }} ports: - - containerPort: {{ .Values.a1simulator.service.internalPort }} + - containerPort: {{ .Values.a1simulator.service.targetPort1 }} + protocol: TCP + - containerPort: {{ .Values.a1simulator.service.targetPort2 }} protocol: TCP readinessProbe: tcpSocket: - port: {{ .Values.a1simulator.service.internalPort }} - initialDelaySeconds: 5 - periodSeconds: 15 + port: {{ .Values.a1simulator.service.targetPort1 }} + initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }} + livenessProbe: + tcpSocket: + port: {{ .Values.a1simulator.service.targetPort1 }} + initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }} env: - name: A1_VERSION value: OSC_2.1.0 @@ -90,13 +97,20 @@ spec: image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }} imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }} ports: - - containerPort: {{ .Values.a1simulator.service.internalPort }} + - containerPort: {{ .Values.a1simulator.service.targetPort1 }} + protocol: TCP + - containerPort: {{ .Values.a1simulator.service.targetPort2 }} protocol: TCP readinessProbe: tcpSocket: - port: {{ .Values.a1simulator.service.internalPort }} - initialDelaySeconds: 5 - periodSeconds: 15 + port: {{ .Values.a1simulator.service.targetPort1 }} + initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }} + livenessProbe: + tcpSocket: + port: {{ .Values.a1simulator.service.targetPort1 }} + initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }} env: - name: A1_VERSION value: STD_1.1.3 \ No newline at end of file diff --git a/nonrtric/helm/a1simulator/values.yaml b/nonrtric/helm/a1simulator/values.yaml index 97316395..53715699 100644 --- a/nonrtric/helm/a1simulator/values.yaml +++ b/nonrtric/helm/a1simulator/values.yaml @@ -26,7 +26,18 @@ a1simulator: name: a1-simulator tag: 1.0.1 service: - internalPort: 8085 + httpName: http + internalPort1: 8085 + targetPort1: 8085 + httpsName: https + internalPort2: 8185 + targetPort2: 8185 + liveness: + initialDelaySeconds: 20 + periodSeconds: 10 + readiness: + initialDelaySeconds: 20 + periodSeconds: 10 oscVersion: name: a1-sim-osc replicaCount: 2 diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json index 4c3e18af..86379d94 100644 --- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json +++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json @@ -11,7 +11,7 @@ "ric":[ { "name":"ric1", - "baseUrl":"http://a1-sim-osc-0.a1-sim:8085", + "baseUrl":"https://a1-sim-osc-0.a1-sim:8185", "controller": "controller1", "managedElementIds":[ "kista_1", @@ -29,7 +29,7 @@ }, { "name":"ric3", - "baseUrl":"http://a1-sim-std-0.a1-sim:8085", + "baseUrl":"https://a1-sim-std-0.a1-sim:8185", "controller": "controller1", "managedElementIds":[ "kista_1", -- 2.16.6