From: wrider Date: Fri, 12 Jul 2019 18:51:05 +0000 (-0400) Subject: Defining all port numbers in common template X-Git-Tag: 0.0.2~63 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=3be243af8254463c1716cf3f05d5806f17e370d7;p=it%2Fdep.git Defining all port numbers in common template Change-Id: If67b94497585d1d64fee9e647e31d7dabcd52eb8 Signed-off-by: wrider --- diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ports.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ports.tpl new file mode 100644 index 00000000..fe463c28 --- /dev/null +++ b/ric-common/Common-Template/helm/ric-common/templates/_ports.tpl @@ -0,0 +1,71 @@ +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + +{{/* + This file defines the port numbers various components expose. + + To ensure compatibility when switching between ClusterIP and headless service + types, the service port and container port must be the same. + + For inter-component communications, the sender shall use + {{ include "common.serviceport.XXXX" . }} template in its chart to + configure the destination port. The receiver side MUST keep the + port numbers consistent with the ports that the container code implements. +*/}} + +{{- define "common.serviceport.e2term.rmr.data" -}}38000{{- end -}} +{{- define "common.serviceport.e2term.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.e2term.http" -}}8080{{- end -}} +{{- define "common.serviceport.e2term.sctp" -}}5577{{- end -}} + + +{{- define "common.serviceport.e2mgr.rmr.data" -}}3801{{- end -}} +{{- define "common.serviceport.e2mgr.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.e2mgr.http" -}}3800{{- end -}} + +{{- define "common.serviceport.a1mediator.rmr.data" -}}4562{{- end -}} +{{- define "common.serviceport.a1mediator.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.a1mediator.http" -}}10000{{- end -}} + +{{- define "common.serviceport.rtmgr.rmr.data" -}}4560{{- end -}} +{{- define "common.serviceport.rtmgr.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.rtmgr.http" -}}3800{{- end -}} + +{{- define "common.serviceport.submgr.rmr.data" -}}4560{{- end -}} +{{- define "common.serviceport.submgr.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.submgr.http" -}}3800{{- end -}} + +{{- define "common.serviceport.appmgr.rmr.data" -}}4560{{- end -}} +{{- define "common.serviceport.appmgr.rmr.route" -}}4561{{- end -}} +{{- define "common.serviceport.appmgr.http" -}}8080{{- end -}} + +{{- define "common.serviceport.nexus.http" -}}8080{{- end -}} + +{{- define "common.serviceport.dashboard.http" -}}30080{{- end -}} +{{- define "common.serviceport.dashboard.container" -}}8080{{- end -}} + +{{- define "common.serviceport.dbaas.tcp" -}}6379{{- end -}} + +{{- define "common.serviceport.messagerouter.http" -}}3904{{- end -}} +{{- define "common.serviceport.messagerouter.https" -}}3905{{- end -}} +{{- define "common.serviceport.messagerouter.kafka" -}}9092{{- end -}} +{{- define "common.serviceport.messagerouter.zookeeper" -}}2181{{- end -}} + +{{- define "common.serviceport.ves.http" -}}30235{{- end -}} +{{- define "common.serviceport.ves.http.container" -}}8080{{- end -}} +{{- define "common.serviceport.ves.https" -}}30417{{- end -}} +{{- define "common.serviceport.ves.https.container" -}}8443{{- end -}} \ No newline at end of file diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml index db68c150..8f660053 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/config.yaml @@ -23,15 +23,15 @@ metadata: data: local.rt: | newrt|start - rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:4562 + rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }} rte|12011|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12012|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12021|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563;service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560 diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml index dbd8857c..ffa41a39 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml @@ -60,13 +60,13 @@ spec: imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - name: http - containerPort: {{ .Values.a1mediator.service.http.containerPort }} + containerPort: {{ include "common.serviceport.a1mediator.http" . }} protocol: TCP - name: rmrroute - containerPort: {{ .Values.a1mediator.service.rmr.route.port }} + containerPort: {{ include "common.serviceport.a1mediator.rmr.route" . }} protocol: TCP - name: rmrdata - containerPort: {{ .Values.a1mediator.service.rmr.data.port }} + containerPort: {{ include "common.serviceport.a1mediator.rmr.data" . }} protocol: TCP livenessProbe: httpGet: diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml index 3b4203aa..3141b1ec 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml @@ -20,10 +20,11 @@ metadata: name: {{ include "common.configmapname.a1mediator" . }}-env data: DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_SERVICE_PORT: "6379" + DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_PORT_6379_TCP_PORT: "6379" - RMR_RTG_SVC: "{{ .Values.a1mediator.service.rmr.route.port }}" + DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} + RMR_RTG_SVC: {{ include "common.serviceport.a1mediator.rmr.route" . | quote }} PYTHONUNBUFFERED: "0" RMR_RCV_RETRY_INTERVAL: "{{ .Values.a1mediator.rmr_timeout_config.rcv_retry_interval_ms }}" RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.rcv_retry_times }}" + diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml index d7b63abc..4d26d304 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/ingress-a1mediator.yaml @@ -9,4 +9,4 @@ spec: - path: /a1mediator backend: serviceName: {{ include "common.servicename.a1mediator.http" . }} - servicePort: {{ .Values.a1mediator.service.http.port }} \ No newline at end of file + servicePort: {{ include "common.serviceport.a1mediator.http" . }} diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml index b0f5a499..1aeab75e 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-http.yaml @@ -28,7 +28,7 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.a1mediator.service.http.port }} + - port: {{ include "common.serviceport.a1mediator.http" . }} protocol: "TCP" name: "http" targetPort: "http" diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml index 7f555ca8..c8f19f0e 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/service-rmr.yaml @@ -28,11 +28,11 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.a1mediator.service.rmr.route.port }} + - port: {{ include "common.serviceport.a1mediator.rmr.route" . }} protocol: "TCP" name: "rmrroute" targetPort: "rmrroute" - - port: {{ .Values.a1mediator.service.rmr.data.port }} + - port: {{ include "common.serviceport.a1mediator.rmr.data" . }} protocol: "TCP" name: "rmrdata" targetPort: "rmrdata" diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml index 7893d3c5..d07c0ab3 100644 --- a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml @@ -31,16 +31,10 @@ a1mediator: name: ric-plt-a1 tag: 0.8.3 - service: - http: - port: 10000 - containerPort: 10000 - rmr: - route: - port: 4561 - data: - port: 4562 - + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. # these are ENV variables that A1 takes; see docs rmr_timeout_config: diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml index 1a152175..894e2b1e 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml @@ -20,7 +20,7 @@ kind: ConfigMap metadata: name: {{ include "common.configmapname.appmgr" . }}-appconfig data: - {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.service.http.containerPort) | quote -}} + {{- $restport := (printf ":%s" (include "common.serviceport.appmgr.http" .) ) | quote -}} {{- $helmrepo := include "common.helmrepository" . | quote -}} {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}} {{- $tiller := include "common.helmrepositorytiller" . | quote -}} diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml index 1ea190b8..5620cd02 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml @@ -47,13 +47,13 @@ spec: imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - name: http - containerPort: {{ .Values.appmgr.service.http.containerPort }} + containerPort: {{ include "common.serviceport.appmgr.http" . }} protocol: TCP - name: rmrroute - containerPort: {{ .Values.appmgr.service.rmr.route.port }} + containerPort: {{ include "common.serviceport.appmgr.rmr.route" . }} protocol: TCP - name: rmrdata - containerPort: {{ .Values.appmgr.service.rmr.data.port }} + containerPort: {{ include "common.serviceport.appmgr.rmr.data" . }} protocol: TCP volumeMounts: - name: config-volume diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml index d371589b..e0139f09 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/env.yaml @@ -22,7 +22,8 @@ metadata: data: NAME: "xappmgr" DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_SERVICE_PORT: "6379" + DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_PORT_6379_TCP_PORT: "6379" - RMR_RTG_SVC: "{{ .Values.appmgr.service.rmr.route.port }}" + DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} + RMR_RTG_SVC: {{ include "common.serviceport.appmgr.rmr.route" . | quote }} + diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml index 683b32b2..8123930e 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/ingress-appmgr.yaml @@ -9,4 +9,4 @@ spec: - path: /appmgr backend: serviceName: {{ include "common.servicename.appmgr.http" . }} - servicePort: {{ .Values.appmgr.service.http.port }} + servicePort: {{ include "common.serviceport.appmgr.http" . }} diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml index 265b1e9c..57a7d971 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-http.yaml @@ -28,7 +28,7 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.appmgr.service.http.port }} + - port: {{ include "common.serviceport.appmgr.http" . }} protocol: "TCP" name: "http" targetPort: "http" diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml index 3451529d..a0608cba 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-rmr.yaml @@ -28,11 +28,11 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.appmgr.service.rmr.route.port }} + - port: {{ include "common.serviceport.appmgr.rmr.route" . }} protocol: "TCP" name: "rmrroute" targetPort: "rmrroute" - - port: {{ .Values.appmgr.service.rmr.data.port }} + - port: {{ include "common.serviceport.appmgr.rmr.data" . }} protocol: "TCP" name: "rmrdata" targetPort: "rmrdata" diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-test.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-test.yaml deleted file mode 100644 index b3ad56a6..00000000 --- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/service-test.yaml +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename.dashboard.http" . }} - namespace: {{ include "common.namespace.platform" . }} - labels: - app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: ClusterIP - ports: - - port: {{ .Values.appmgr.service.http.port }} - protocol: "TCP" - name: "http" - targetPort: "http" - selector: - app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }} - release: {{ .Release.Name }} - diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml index d0929ce3..351962c1 100644 --- a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml @@ -73,16 +73,10 @@ appmgr: reponame: "helm-repo" - service: - http: - port: 8080 - containerPort: 8080 - rmr: - route: - port: 4561 - data: - port: 4560 - + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. # config # Path referred in xapp-manager for retrieving configuration details diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml index 867b4c26..fb6ec819 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml @@ -44,7 +44,7 @@ spec: - image: {{ include "common.repository" . }}/{{ .Values.dbaas.backend.image.name }}:{{ .Values.dbaas.backend.image.tag }} imagePullPolicy: {{ include "common.pullPolicy" . }} ports: - - containerPort: {{ .Values.dbaas.backend.containerPort }} + - containerPort: {{ include "common.serviceport.dbaas.tcp" . }} name: sql protocol: TCP name: {{ include "common.containername.dbaas" . }} diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml index d0f3df50..af290b79 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml @@ -30,7 +30,7 @@ spec: app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }} release: {{ .Release.Name }} ports: - - port: {{ .Values.dbaas.backend.port }} + - port: {{ include "common.serviceport.dbaas.tcp" . }} targetPort: "sql" protocol: "TCP" name: "sql" diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml index 965aaa67..2f1de685 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/values.yaml @@ -23,8 +23,11 @@ dbaas: backend: terminationGracePeriodSeconds: 0 replicas: 1 - port: 6379 - containerPort: 6379 image: name: ric-plt-dbaas tag: 0.1.0 + + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. \ No newline at end of file diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml index 6c9b3181..dacb7e20 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml @@ -24,15 +24,15 @@ metadata: data: router.txt: | newrt|start - rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:4562 + rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }} rte|12011|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12012|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12021|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563;service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560 diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml index 330f1236..56932876 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml @@ -53,11 +53,11 @@ spec: name: {{ include "common.configmapname.e2mgr" . }}-env ports: - name: "http" - containerPort: {{ .Values.e2mgr.service.http.containerPort }} + containerPort: {{ include "common.serviceport.e2mgr.http" . }} - name: "rmrroute" - containerPort: {{ .Values.e2mgr.service.rmr.route.port }} + containerPort: {{ include "common.serviceport.e2mgr.rmr.route" . }} - name: "rmrdata" - containerPort: {{ .Values.e2mgr.service.rmr.data.port }} + containerPort: {{ include "common.serviceport.e2mgr.rmr.data" . }} stdin: true tty: true securityContext: diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml index b37cfc42..dd70a68a 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/env.yaml @@ -20,8 +20,10 @@ metadata: name: {{ include "common.configmapname.e2mgr" . }}-env data: DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_SERVICE_PORT: "6379" + DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_PORT_6379_TCP_PORT: "6379" - RMR_RTG_SVC: "{{ .Values.e2mgr.service.rmr.route.port }}" + DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} + RMR_RTG_SVC: {{ include "common.serviceport.e2mgr.rmr.route" . | quote }} RIC_ID: "{{ .Values.e2mgr.env.RIC_ID }}" + #nano: {{ include "common.serviceport.e2mgr.rmr.data" . | quote }} + diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml index d1c8faac..23d1975d 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/ingress-e2mgr.yaml @@ -9,4 +9,4 @@ spec: - path: /e2mgr backend: serviceName: {{ include "common.servicename.e2mgr.http" . }} - servicePort: {{ .Values.e2mgr.service.http.port }} + servicePort: {{ include "common.serviceport.e2mgr.http" . }} diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml index 5e309247..53319bc8 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-http.yaml @@ -28,7 +28,7 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.e2mgr.service.http.port }} + - port: {{ include "common.serviceport.e2mgr.http" . }} protocol: "TCP" name: "http" targetPort: "http" diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml index 6a4bdade..a9e94165 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service-rmr.yaml @@ -28,11 +28,11 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.e2mgr.service.rmr.route.port }} + - port: {{ include "common.serviceport.e2mgr.rmr.route" . }} protocol: "TCP" name: "rmrroute" targetPort: "rmrroute" - - port: {{ .Values.e2mgr.service.rmr.data.port }} + - port: {{ include "common.serviceport.e2mgr.rmr.data" . }} protocol: "TCP" name: "rmrdata" targetPort: "rmrdata" diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml index f2509d8b..f6ee2dd3 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/values.yaml @@ -47,12 +47,8 @@ e2mgr: env: RIC_ID: "bbbccc-abcd0e/20" - service: - http: - port: 3800 - containerPort: 3800 - rmr: - route: - port: 4561 - data: - port: 3801 + + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml index 8bd6c124..d62a2394 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml @@ -24,15 +24,15 @@ metadata: data: router.txt: | newrt|start - rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:3801 - rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:38000 - rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:4562 + rte|10060|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10061|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10062|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10080|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10360|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|10361|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|10362|{{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2mgr.rmr.data" . }} + rte|12010|{{ include "common.servicename.e2term.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.e2term.rmr.data" . }} + rte|20001|{{ include "common.servicename.a1mediator.rmr" . }}.{{ include "common.namespace.platform" . }}:{{ include "common.serviceport.a1mediator.rmr.data" . }} rte|12011|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12012|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563 rte|12021|service-ricxapp-admctrl-rmr.{{ include "common.namespace.xapp" . }}:4563;service-ricxapp-ueec-rmr.{{ include "common.namespace.xapp" . }}:4560 diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml index 993fd52d..6c6d71d4 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml @@ -55,9 +55,9 @@ spec: name: {{ include "common.configmapname.e2term" . }}-env ports: - name: "rmrroute" - containerPort: {{ .Values.e2term.service.rmr.route.port }} + containerPort: {{ include "common.serviceport.e2term.rmr.route" . }} - name: "rmrdata" - containerPort: {{ .Values.e2term.service.rmr.data.port }} + containerPort: {{ include "common.serviceport.e2term.rmr.data" . }} stdin: true tty: true securityContext: diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml index 7637a413..b796de5a 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/env.yaml @@ -20,10 +20,10 @@ metadata: name: {{ include "common.configmapname.e2term" . }}-env data: DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_SERVICE_PORT: "6379" + DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_PORT_6379_TCP_PORT: "6379" - RMR_RTG_SVC: "{{ .Values.e2term.service.rmr.route.port }}" - sctp: "5577" - nano: "{{ .Values.e2term.service.rmr.data.port }}" + DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} + RMR_RTG_SVC: {{ include "common.serviceport.e2term.rmr.route" . | quote }} + sctp: {{ include "common.serviceport.e2term.sctp" . | quote }} + nano: {{ include "common.serviceport.e2term.rmr.data" . | quote }} print: "{{ .Values.e2term.env.print }}" diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml index f4cf20a9..f9443a51 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/service-rmr.yaml @@ -28,11 +28,11 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.e2term.service.rmr.route.port }} + - port: {{ include "common.serviceport.e2term.rmr.route" . }} protocol: "TCP" targetPort: "rmrroute" name: "rmrroute" - - port: {{ .Values.e2term.service.rmr.data.port }} + - port: {{ include "common.serviceport.e2term.rmr.data" . }} protocol: "TCP" targetPort: "rmrdata" name: "rmrdata" diff --git a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml index f40e0684..a4d72fcc 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/values.yaml @@ -40,13 +40,10 @@ e2term: replicaCount: 1 - env: print: "1" - - service: - rmr: - route: - port: 4561 - data: - port: 38000 + + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number. diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml index 0a2a6292..c0b83f37 100644 --- a/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/values.yaml @@ -16,4 +16,8 @@ kong: http: nodePort: 30080 tls: - nodePort: 30443 \ No newline at end of file + nodePort: 30443 + # These port numbers MUST matche with what's in + # ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl file. + # If need to change a proxy port here, do not forget to update the + # _ingresscontroller.tpl file with the new port number. diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml index 1cf2ab61..80a2d3f3 100644 --- a/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/values.yaml @@ -18,5 +18,8 @@ kong: nodePort: 31080 tls: nodePort: 31443 - + # These port numbers MUST matche with what's in + # ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl file. + # If need to change a proxy port here, do not forget to update the + # _ingresscontroller.tpl file with the new port number. diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml index 9cd05fa3..0214fc3b 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml @@ -34,17 +34,17 @@ data: { "name": "E2TERM", "fqdn": "{{ include "common.servicename.e2term.rmr" . }}", - "port": 4561 + "port": {{ include "common.serviceport.e2term.rmr.data" . }} }, { "name": "SUBMAN", "fqdn": "{{ include "common.servicename.submgr.rmr" . }}", - "port": 4561 + "port": {{ include "common.serviceport.submgr.rmr.data" . }} }, { "name": "E2MAN", "fqdn": "{{ include "common.servicename.e2mgr.rmr" . }}", - "port": 4561 + "port": {{ include "common.serviceport.e2mgr.rmr.data" . }} } ] } diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml index fd930045..2cffaa90 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml @@ -56,9 +56,9 @@ spec: readOnly: true ports: - name: "rmrroute" - containerPort: {{ .Values.rtmgr.service.rmr.route.port }} + containerPort: {{ include "common.serviceport.rtmgr.rmr.route" . }} - name: "rmrdata" - containerPort: {{ .Values.rtmgr.service.rmr.data.port }} + containerPort: {{ include "common.serviceport.rtmgr.rmr.data" . }} volumes: - name: "rtmgrcfg" configMap: diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml index 2f6ab6a0..ff374b69 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml @@ -20,11 +20,11 @@ metadata: name: {{ include "common.configmapname.rtmgr" . }}-env data: DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_SERVICE_PORT: "6379" + DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }} - DBAAS_PORT_6379_TCP_PORT: "6379" - RMR_RTG_SVC: "{{ .Values.rtmgr.service.rmr.route.port }}" - XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:8080/ric/v1/xapps" + DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} + RMR_RTG_SVC: {{ include "common.serviceport.rtmgr.rmr.route" . | quote }} + XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps" RTFILE: "/db/rt.json" CFGFILE: "/cfg/rtmgr-config.json" RPE: "{{ .Values.rtmgr.rpe }}" @@ -33,4 +33,3 @@ data: NBI: "{{ .Values.rtmgr.nbi }}" NBIURL: "{{ .Values.rtmgr.nbiurl }}" LOGLEVEL: "{{ .Values.rtmgr.loglevel }}" - diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml index 74712047..ac2f31e3 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service-rmr.yaml @@ -28,11 +28,11 @@ metadata: spec: type: ClusterIP ports: - - port: {{ .Values.rtmgr.service.rmr.route.port }} + - port: {{ include "common.serviceport.rtmgr.rmr.route" . }} protocol: TCP targetPort: "rmrroute" name: "rmrroute" - - port: {{ .Values.rtmgr.service.rmr.data.port }} + - port: {{ include "common.serviceport.rtmgr.rmr.data" . }} protocol: TCP targetPort: "rmrdata" name: "rmrdata" diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml index 904a5971..1b989b0c 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml @@ -39,13 +39,6 @@ rtmgr: name: rtmgr tag: 0.0.2 - service: - rmr: - route: - port: 4561 - data: - port: 4560 - rpe: rmrpush sbi: nngpush sbiurl: 0.0.0.0 @@ -53,3 +46,7 @@ rtmgr: nbiurl: http://0.0.0.0:8888 loglevel: DEBUG + # Service ports are now defined in + # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file. + # If need to change a service port, make the code change necessary, then + # update the _ports.tpl file with the new port number.