Change-Id: Id53bc7f8506eb897f9060b15db08a5901ab769a0
Issue-ID: NONRTRIC-231
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-a1-controller
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-a1-controller
- 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:
a1simulator:
a1simulator:
command:
- /opt/onap/sdnc/bin/startODL.sh
ports:
command:
- /opt/onap/sdnc/bin/startODL.sh
ports:
- - containerPort: {{ .Values.a1controller.service.internalPort }}
+ - containerPort: {{ .Values.a1controller.service.targetPort1 }}
+ protocol: TCP
+ - containerPort: {{ .Values.a1controller.service.targetPort2 }}
protocol: TCP
readinessProbe:
tcpSocket:
protocol: TCP
readinessProbe:
tcpSocket:
- port: {{ .Values.a1controller.service.internalPort }}
- initialDelaySeconds: 15
- periodSeconds: 15
+ port: {{ .Values.a1controller.service.targetPort1 }}
+ initialDelaySeconds: {{ .Values.a1controller.readiness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.a1controller.readiness.periodSeconds }}
+ livenessProbe:
+ tcpSocket:
+ port: {{ .Values.a1controller.service.targetPort1 }}
+ initialDelaySeconds: {{ .Values.a1controller.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.a1controller.liveness.periodSeconds }}
---
apiVersion: apps/v1
kind: Deployment
---
apiVersion: apps/v1
kind: Deployment
spec:
type: ClusterIP
ports:
spec:
type: ClusterIP
ports:
- - port: {{ .Values.a1controller.service.externalPort }}
+ {{if eq .Values.a1controller.service.allowHttp true -}}
+ - name: {{ index .Values.a1controller.service.httpName }}
+ port: {{ .Values.a1controller.service.internalPort1 }}
+ targetPort: {{ .Values.a1controller.service.targetPort1 }}
+ protocol: TCP
+ {{- end }}
+ - name: {{ index .Values.a1controller.service.httpsName }}
+ port: {{ .Values.a1controller.service.internalPort2 }}
+ targetPort: {{ .Values.a1controller.service.targetPort2 }}
- targetPort: {{ .Values.a1controller.service.internalPort }}
selector:
app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
release: {{ .Release.Name }}
selector:
app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1controller" . }}
release: {{ .Release.Name }}
image:
registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
name: nonrtric-a1-controller
image:
registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
name: nonrtric-a1-controller
- internalPort: 8181
- externalPort: 8282
\ No newline at end of file
+ allowHttp: true
+ httpName: http
+ internalPort1: 8282
+ targetPort1: 8181
+ httpsName: https
+ internalPort2: 8383
+ targetPort2: 8443
+ liveness:
+ initialDelaySeconds: 60
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 60
+ periodSeconds: 10
"controller": [
{
"name": "controller1",
"controller": [
{
"name": "controller1",
- "baseUrl": "http://a1controller:8282",
+ "baseUrl": "https://a1controller:8383",
"userName": "admin",
"password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
}
"userName": "admin",
"password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
}