Still staging images, need to be switched to release image when release is made.
Issue-ID: NONRTRIC-622
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I6604221cf9da0be36fb504cc753ef92188ca1ad4
-f) OVERRIDEYAML=$2
shift
- ;;
+ ;;
*) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
esac
helm repo remove local
$ROOT_DIR/prepare-common-templates
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice nonrtricgateway dmaapadapterservice"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager"
for component in $COMPONENTS; do
echo "Packaging NONRTRIC component [$component]"
helm dep up $ROOT_DIR/../nonrtric/helm/$component
# This script to undeploy the NONRTRIC
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice nonrtricgateway dmaapadapterservice"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice informationservice rappcatalogueservice nonrtricgateway dmaapadapterservice dmaapmediatorservice helmmanager"
RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}')
kubectl get configmap -n $RECIPE_NAMESPACE nonrtric-recipe -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
# Here you can enable inclusion or exclusion of each component. A not installed component will not be installed.
nonrtric:
installPms: true
- installA1controller: false
- installA1simulator: false
+ installA1controller: true
+ installA1simulator: true
installControlpanel: true
- installEnrichmentservice: true
- installRappcatalogueservice: false
+ installInformationservice: true
+ installRappcatalogueservice: true
installNonrtricgateway: true
installKong: false
- installDmaapAdapterservice: true
+ installDmaapadapterservice: true
+ installDmaapmediatorservice: true
+ installHelmmanager: true
volume1:
# Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning)
size: 2Gi
volume2:
# Set the size to 0 if you do not need the volume (if you are using Dynamic Volume Provisioning)
size: 2Gi
- storageClassName: ecs-storage
+ storageClassName: ics-storage
+ volume3:
+ size: 1Gi
+ storageClassName: helmmanager-storage
common:
releasePrefix: r3-dev-nonrtric
namespace:
nonrtric: nonrtric
ingressClassName: kong
-enrichmentservice:
- enrichmentservice:
- imagePullPolicy: IfNotPresent
+
+informationservice:
+ informationservice:
+ imagePullPolicy: Always
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
- name: 'nonrtric-enrichment-coordinator-service'
+ name: 'nonrtric-information-coordinator-service'
tag: 1.2.0
service:
allowHttp: true
initialDelaySeconds: 20
periodSeconds: 10
persistence:
- # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
- # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be fon instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
+ # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
+ # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
size: 2Gi
- storageClassName: ecs-storage
+ storageClassName: ics-storage
+ ingress:
+ enabled: true
# Need to check the external port Availability
policymanagementservice:
policymanagementservice:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-policy-agent
- tag: 2.2.1
+ tag: 2.3.0
service:
allowHttp: true
httpName: http
initialDelaySeconds: 20
periodSeconds: 10
persistence:
- # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
- # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be fon instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
+ # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
+ # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
size: 2Gi
storageClassName: pms-storage
-
+ ingress:
+ enabled: true
# A1 Conttroller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart.
a1controller:
a1controller:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
- name: nonrtric-a1-controller
- tag: 2.0.1
+ registry: 'nexus3.onap.org:10002/onap'
+ name: sdnc-image
+ tag: 2.1.6
replicaCount: 1
service:
allowHttp: true
a1simulator:
a1simulator:
name: a1-sim
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+ registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: a1-simulator
- tag: 2.1.0
+ tag: 2.2.0
service:
allowHttp: true
httpName: http
controlpanel:
controlpanel:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-controlpanel
- tag: 2.2.0
+ tag: 2.3.0
replicaCount: 1
service:
allowHttp: true
readiness:
initialDelaySeconds: 20
periodSeconds: 10
-
- ingress:
- enabled: false
ingress:
enabled: false
+
rappcatalogueservice:
rappcatalogueservice:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+ registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-r-app-catalogue
- tag: 1.0.0
+ tag: 1.1.0
service:
allowHttp: true
httpName: http
internalPort1: 9085
- targetPort1: 8080
+ targetPort1: 8680
httpsName: https
internalPort2: 9086
- targetPort2: 8433
+ targetPort2: 8633
liveness:
initialDelaySeconds: 20
periodSeconds: 10
nonrtricgateway:
nonrtricgateway:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-gateway
- tag: 1.0.0
+ tag: 1.1.0
service:
httpName: http
internalPort1: 9090
dmaapadapterservice:
dmaapadapterservice:
- imagePullPolicy: IfNotPresent
+ imagePullPolicy: Always
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: 'nonrtric-dmaap-adaptor'
readiness:
initialDelaySeconds: 20
periodSeconds: 10
+
+dmaapmediatorservice:
+ dmaapmediatorservice:
+ imagePullPolicy: IfNotPresent
+ image:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: "nonrtric-dmaap-mediator-producer"
+ tag: 1.0.0
+ service:
+ allowHttp: true
+ httpName: http
+ internalPort1: 8085
+ targetPort1: 8085
+ httpsName: https
+ internalPort2: 8185
+ targetPort2: 8185
+ liveness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+
+helmmanager:
+ helmmanager:
+ clusterRoleName: cluster-admin
+ imagePullPolicy: Always
+ image:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: "nonrtric-helm-manager"
+ tag: 1.1.0
+ service:
+ httpName: http
+ internalPort1: 8112
+ targetPort1: 8083
+ liveness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ persistence:
+ # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed size should be the same.
+ # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be for instance 'standard' or 'gluster-fs' (depeneds on which classes that are available)
+ size: 1Gi
+ storageClassName: helmmanager-storage
\ No newline at end of file
# This script is populating some data into nonrtric for demo/test purpose.
# First this script copies data/ folder into one of the rics, in below case a1-sim-osc-0.
-# Then from the ric, run populate_policy_data.sh and populate_enrichment_data.sh.
+# Then from the ric, run populate_policy_data.sh and populate_information_data.sh.
# populate_policy_data.sh creates policy-types, service, and policies.
-# populate_enrichment_data.sh creates EiProducer, EiType, and EiJob.
+# populate_information_data.sh creates EiProducer, EiType, and EiJob.
#
# Why we run the scripts in the ric, not from the host?
# Because a1-simulators(ric) are deployed in statefulset,
# they are not exposed to outside the k8s cluster.
# And we must create policy type into the ric first.
-# Similarly, the enrichmentservice is not exposed outside the k8s cluster,
-# hence the commands for populating enrichment data need to be run from within the cluster.
+# Similarly, the informationservice is not exposed outside the k8s cluster,
+# hence the commands for populating information data need to be run from within the cluster.
kubectl -n nonrtric cp run_in_k8s a1-sim-osc-0:/usr/src/app/
-kubectl -n nonrtric exec -it a1-sim-osc-0 -- bash -c 'cd run_in_k8s/ && ./populate_policy_data.sh && ./populate_enrichment_data.sh'
\ No newline at end of file
+kubectl -n nonrtric exec -it a1-sim-osc-0 -- bash -c 'cd run_in_k8s/ && ./populate_policy_data.sh && ./populate_information_data.sh'
\ No newline at end of file
# ============LICENSE_END=================================================
#
-# This script will generate some dummy enrichment data in the running system.
+# This script will generate some dummy information data in the running system.
# It will create:
-# one EiProducer in ECS
-# one EiType in ECS
-# one EiJob in ECS
+# one EiProducer in ICS
+# one EiType in ICS
+# one EiJob in ICS
-ecs_host="enrichmentservice"
-ecs_port="9082"
+ics_host="informationservice"
+ics_port="9082"
httpx=http
-echo "ECS status:"
-curl -skw " %{http_code}" $httpx://$ecs_host:$ecs_port/status
+echo "ICS status:"
+curl -skw " %{http_code}" $httpx://$ics_host:$ics_port/status
echo -e "\n"
# Create EiType
echo "Create EiType:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @testdata/ECS/EiType.json
+curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @testdata/ICS/EiType.json
echo -e "\n"
# Get EiTypes
echo "Get EiTypes:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types -H Content-Type:application/json
echo -e "\n"
# Get Individual EiType
echo "Get Individual EiType:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types/type1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-types/type1 -H Content-Type:application/json
echo -e "\n"
# Create EiProducer
echo "Create EiProducer:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @testdata/ECS/EiProducer.json
+curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @testdata/ICS/EiProducer.json
echo -e "\n"
# Get EiProducers
echo "Get EiProducers:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers -H Content-Type:application/json
echo -e "\n"
# Get Individual EiProducer
echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json
echo -e "\n"
# Get Individual EiProducer Status
echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1/status -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-producer/v1/info-producers/1/status -H Content-Type:application/json
echo -e "\n"
# Create EiJob
echo "Create EiJob Of A Certain Type type1:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json --data-binary @testdata/ECS/EiJob.json
+curl -X PUT -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json --data-binary @testdata/ICS/EiJob.json
echo -e "\n"
# Get EiJobs
echo "Get EiJobs:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs -H Content-Type:application/json
echo -e "\n"
# Get Individual EiJob:
echo "Get Individual EiJob:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ics_host:$ics_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json
echo -e "\n"
\ No newline at end of file
- name: {{ include "common.containername.a1controller" . }}
image: {{ .Values.a1controller.image.registry }}/{{ .Values.a1controller.image.name }}:{{ .Values.a1controller.image.tag }}
imagePullPolicy: {{ .Values.a1controller.imagePullPolicy }}
- env:
- - name: MYSQL_ROOT_PASSWORD
- value: openECOMP1.0
- - name: SDNC_CONFIG_DIR
- value: /opt/onap/sdnc/data/properties
command:
- /opt/onap/sdnc/bin/startODL.sh
ports:
protocol: TCP
- containerPort: {{ .Values.a1controller.service.targetPort2 }}
protocol: TCP
+ env:
+ - name: MYSQL_ROOT_PASSWORD
+ value: 'itsASecret'
+ - name: MYSQL_USER
+ value: 'sdnctl'
+ - name: MYSQL_PASSWORD
+ value: 'gamma'
+ - name: MYSQL_DATABASE
+ value: 'sdnctl'
+ - name: SDNC_CONFIG_DIR
+ value: '/opt/onap/sdnc/data/properties'
+ - name: SDNC_BIN
+ value: '/opt/onap/sdnc/bin'
+ - name: ODL_CERT_DIR
+ value: '/tmp'
+ - name: ODL_ADMIN_USERNAME
+ value: admin
+ - name: ODL_ADMIN_PASSWORD
+ value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
+ - name: ODL_USERNAME
+ value: admin
+ - name: ODL_PASSWORD
+ value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
+ - name: SDNC_DB_INIT
+ value: 'true'
+ - name: A1_TRUSTSTORE_PASSWORD
+ value: 'a1adapter'
+ - name: AAI_TRUSTSTORE_PASSWORD
+ value: 'changeit'
readinessProbe:
tcpSocket:
port: {{ .Values.a1controller.service.targetPort1 }}
spec:
containers:
- name: sdnc-db-container
- image: mysql/mysql-server:5.6
+ image: nexus3.o-ran-sc.org:10001/mariadb:10.5
imagePullPolicy: IfNotPresent
env:
- name: MYSQL_ROOT_HOST
value: '%'
- name: MYSQL_ROOT_PASSWORD
- value: openECOMP1.0
+ value: 'itsASecret'
ports:
- containerPort: 3306
\ No newline at end of file
a1controller:
imagePullPolicy: IfNotPresent
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
- name: nonrtric-a1-controller
- tag: 2.0.1
+ registry: 'nexus3.onap.org:10002/onap'
+ name: sdnc-image
+ tag: 2.1.6
replicaCount: 1
service:
allowHttp: true
name: a1-sim
imagePullPolicy: IfNotPresent
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+ registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: a1-simulator
- tag: 2.1.0
+ tag: 2.2.0
service:
allowHttp: true
httpName: http
--- /dev/null
+events{}
+
+http {
+ include /etc/nginx/mime.types;
+
+ upstream backend {
+ server kong-proxy.kong:80;
+ }
+
+ server {
+ listen 8080;
+ server_name localhost;
+ root /usr/share/nginx/html;
+ index index.html;
+ location /a1-policy/ {
+ proxy_pass http://backend;
+ }
+ location /data-producer/ {
+ proxy_pass http://backend;
+ }
+ location /data-consumer/ {
+ proxy_pass http://backend;
+ }
+ location / {
+ try_files $uri $uri/ /index.html;
+ }
+ }
+}
\ No newline at end of file
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{if eq .Values.controlpanel.ingress.enabled false }}
+{{ tpl (.Files.Glob "resources-ngw/*").AsConfig . | indent 2 }}
+{{ else }}
+{{ tpl (.Files.Glob "resources-ing/*").AsConfig . | indent 2 }}
+{{ end }}
\ No newline at end of file
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-controlpanel
- tag: 2.2.0
+ tag: 2.3.0
replicaCount: 1
service:
allowHttp: true
readiness:
initialDelaySeconds: 20
periodSeconds: 10
+ ingress:
+ enabled: true
\ No newline at end of file
endpoints:
web:
exposure:
+ # Enabling of springboot actuator features. See springboot documentation.
include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
-
+springdoc:
+ show-actuator: true
logging:
+ # Configuration of logging
level:
ROOT: ERROR
org.springframework: ERROR
org.springframework.data: ERROR
org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
- org.oran.dmaapadapter: INFO
+ org.oran.dmaapadapter: DEBUG
file:
name: /var/log/dmaap-adaptor-service/application.log
server:
+ # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework.
+ # See springboot documentation.
port : 8435
http-port: 8084
ssl:
key-alias: policy_agent
app:
webclient:
+ # Configuration of the trust store used for the HTTP client (outgoing requests)
+ # The file location and the password for the truststore is only relevant if trust-store-used == true
+ # Note that the same keystore as for the server is used.
trust-store-used: false
trust-store-password: policy_agent
trust-store: /opt/app/dmaap-adaptor-service/etc/cert/truststore.jks
+ # Configuration of usage of HTTP Proxy for the southbound accesses.
+ # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
http.proxy-host:
http.proxy-port: 0
- ecs-base-url: https://enrichmentservice:9083
+ ics-base-url: https://informationservice.nonrtric:9083
+ # Location of the component configuration file. The file will only be used if the Consul database is not used;
+ # configuration from the Consul will override the file.
configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json
dmaap-base-url: http://message-router.onap:3904
# The url used to adress this component. This is used as a callback url sent to other components.
- dmaap-adapter-base-url: https://dmaapadapterservice:9088
\ No newline at end of file
+ dmaap-adapter-base-url: https://dmaapadapterservice.nonrtric:9088
+ # KAFKA boostrap server. This is only needed if there are Information Types that uses a kafkaInputTopic
+ kafka:
+ bootstrap-servers: message-router-kafka.onap:9092
"types": [
{
"id": "ExampleInformationType",
- "dmaapTopicUrl": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
- }
+ "dmaapTopicUrl": "/events/unauthenticated.dmaapadp.json/dmaapadapterproducer/msgs?timeout=15000&limit=100",
+ "useHttpProxy": false
+ },
+ {
+ "id": "ExampleInformationTypeKafka",
+ "kafkaInputTopic": "unauthenticated.dmaapadp_kafka.text",
+ "useHttpProxy": false
+ }
]
-}
+ }
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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
+appVersion: "1.0.0"
+description: A Helm chart for Dmaap Mediator Service
+name: dmaapmediatorservice
+version: 1.0.0
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+dependencies:
+ - name: nonrtric-common
+ version: ^2.0.0
+ repository: "@local"
--- /dev/null
+{
+ "types":
+ [
+ {
+ "id": "STD_Fault_Messages",
+ "dmaapTopicUrl": "/events/unauthenticated.dmaapmed.json/dmaapmediatorproducer/STD_Fault_Messages?timeout=15000&limit=100"
+ }
+ ]
+ }
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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: ConfigMap
+metadata:
+ name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/data/*").AsConfig . | indent 2 }}
\ No newline at end of file
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+ name: {{ include "common.name.dmaapmediatorservice" . }}
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ ports:
+ {{if eq .Values.dmaapmediatorservice.service.allowHttp true -}}
+ - name: {{ index .Values.dmaapmediatorservice.service.httpName }}
+ port: {{ .Values.dmaapmediatorservice.service.internalPort1 }}
+ targetPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
+ protocol: TCP
+ {{- end }}
+ - name: {{ index .Values.dmaapmediatorservice.service.httpsName }}
+ port: {{ .Values.dmaapmediatorservice.service.internalPort2 }}
+ targetPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
+ protocol: TCP
+ selector:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ release: {{ .Release.Name }}
+ type: ClusterIP
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+ name: {{ include "common.name.dmaapmediatorservice" . }}
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ generation: 1
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+ deployment.kubernetes.io/revision: '1'
+spec:
+ serviceName: {{ include "common.name.dmaapmediatorservice" . }}
+ replicas: 1
+ selector:
+ matchLabels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
+ release: {{ .Release.Name }}
+ spec:
+ hostname: {{ include "common.name.dmaapmediatorservice" . }}
+ containers:
+ - name: {{ include "common.container.dmaapmediatorservice" . }}
+ image: {{ .Values.dmaapmediatorservice.image.registry }}/{{ .Values.dmaapmediatorservice.image.name }}:{{ .Values.dmaapmediatorservice.image.tag }}
+ imagePullPolicy: {{ .Values.dmaapmediatorservice.imagePullPolicy }}
+ ports:
+ - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
+ protocol: TCP
+ - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
+ protocol: TCP
+ # Temporarily disabled probes due to no http available in the container
+ # readinessProbe:
+ # tcpSocket:
+ # port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
+ # initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
+ # periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
+ # livenessProbe:
+ # tcpSocket:
+ # port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
+ # initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
+ # periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
+ volumeMounts:
+ - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
+ mountPath: /configs/type_config.json
+ subPath: type_config.json
+
+ env:
+ - name: INFO_PRODUCER_HOST
+ value: https://{{ include "common.name.dmaapmediatorservice" . }}
+ - name: INFO_PRODUCER_PORT
+ value: "{{ .Values.dmaapmediatorservice.service.internalPort2 }}"
+ - name: INFO_COORD_ADDR
+ value: https://informationservice:9083
+ - name: DMAAP_MR_ADDR
+ value: https://message-router.onap:3905
+ - name: LOG_LEVEL
+ value: Info
+ volumes:
+ - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
+ configMap:
+ name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+# Default values for Dmaap Adapter Service.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+dmaapmediatorservice:
+ imagePullPolicy: IfNotPresent
+ image:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: "nonrtric-dmaap-mediator-producer"
+ tag: 1.0.0
+ service:
+ allowHttp: true
+ httpName: http
+ internalPort1: 8085
+ targetPort1: 8085
+ httpsName: https
+ internalPort2: 8185
+ targetPort2: 8185
+ liveness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
--- /dev/null
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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
+appVersion: "1.0.0"
+description: A Helm chart for Helm Manager
+name: helmmanager
+version: 1.0.0
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+dependencies:
+ - name: nonrtric-common
+ version: ^2.0.0
+ repository: "@local"
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+kind: Service
+apiVersion: v1
+metadata:
+ name: {{ include "common.name.helmmanager" . }}
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ ports:
+ - name: {{ index .Values.helmmanager.service.httpName }}
+ port: {{ .Values.helmmanager.service.internalPort1 }}
+ targetPort: {{ .Values.helmmanager.service.targetPort1 }}
+ protocol: TCP
+ selector:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ release: {{ .Release.Name }}
+ type: ClusterIP
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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: ServiceAccount
+metadata:
+ name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa-clusterrolebinding
+ namespace: {{ include "common.namespace.nonrtric" . }}
+subjects:
+- kind: ServiceAccount
+ name: {{ include "common.namespace.nonrtric" . }}-helm-manager-sa
+ namespace: {{ include "common.namespace.nonrtric" . }}
+roleRef:
+ kind: ClusterRole
+ name: {{ .Values.helmmanager.clusterRoleName }}
+ apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+ name: {{ include "common.name.helmmanager" . }}
+ namespace: {{ include "common.namespace.nonrtric" . }}
+ generation: 1
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+
+spec:
+ serviceName: {{ include "common.name.helmmanager" . }}
+ replicas: 1
+ selector:
+ matchLabels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.helmmanager" . }}
+ release: {{ .Release.Name }}
+ spec:
+ hostname: {{ include "common.name.helmmanager" . }}
+ containers:
+ - name: {{ include "common.container.helmmanager" . }}
+ image: {{ .Values.helmmanager.image.registry }}/{{ .Values.helmmanager.image.name }}:{{ .Values.helmmanager.image.tag }}
+ imagePullPolicy: {{ .Values.helmmanager.imagePullPolicy }}
+ ports:
+ - containerPort: {{ .Values.helmmanager.service.targetPort1 }}
+ protocol: TCP
+ # readinessProbe:
+ # tcpSocket:
+ # port: {{ .Values.helmmanager.service.targetPort1 }}
+ # initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
+ # periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}
+ # livenessProbe:
+ # httpGet:
+ # path: /helm/charts
+ # port: {{ .Values.helmmanager.service.targetPort1 }}
+ # initialDelaySeconds: {{ .Values.helmmanager.liveness.initialDelaySeconds }}
+ # periodSeconds: {{ .Values.helmmanager.liveness.periodSeconds }}
+ volumeMounts:
+ - name: {{ include "common.name.helmmanager" . }}-vardata
+ mountPath: "/var/helm-manager-service"
+ volumeClaimTemplates:
+ - metadata:
+ name: {{ include "common.name.helmmanager" . }}-vardata
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: "{{ .Values.helmmanager.persistence.storageClassName }}"
+ resources:
+ requests:
+ storage: "{{ .Values.helmmanager.persistence.size }}"
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+# Default values for Helm Manager
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+helmmanager:
+ clusterRoleName: cluster-admin
+ imagePullPolicy: IfNotPresent
+ image:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: "nonrtric-helm-manager"
+ tag: 1.1.0
+ service:
+ httpName: http
+ internalPort1: 8112
+ targetPort1: 8083
+ liveness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ readiness:
+ initialDelaySeconds: 20
+ periodSeconds: 10
+ persistence:
+ size: 1Gi
+ storageClassName: standard
\ No newline at end of file
--- /dev/null
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
apiVersion: v1
appVersion: "1.0.0"
-description: A Helm chart for Enrichment Coordinator Service
-name: enrichmentservice
+description: A Helm chart for Information Coordinator Service
+name: informationservice
version: 1.0.0
org.springframework: ERROR
org.springframework.data: ERROR
org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
- org.oransc.enrichment: INFO
+ org.oransc.information: INFO
file:
- name: /var/log/enrichment-coordinator-service/application.log
+ name: /var/log/information-coordinator-service/application.log
server:
port : 8434
http-port: 8083
ssl:
key-store-type: JKS
key-store-password: policy_agent
- key-store: /opt/app/enrichment-coordinator-service/etc/cert/keystore.jks
+ key-store: /opt/app/information-coordinator-service/etc/cert/keystore.jks
key-password: policy_agent
key-alias: policy_agent
app:
- filepath: /opt/app/enrichment-coordinator-service/data/application_configuration.json
+ filepath: /opt/app/information-coordinator-service/data/application_configuration.json
webclient:
trust-store-used: false
trust-store-password: policy_agent
- trust-store: /opt/app/enrichment-coordinator-service/etc/cert/truststore.jks
- vardata-directory: /var/enrichment-coordinator-service
\ No newline at end of file
+ trust-store: /opt/app/information-coordinator-service/etc/cert/truststore.jks
+ # Configuration of usage of HTTP Proxy for the southbound accesses.
+ # The HTTP proxy (if configured) will only be used for accessing NearRT RIC:s
+ http.proxy-host:
+ http.proxy-port: 0
+ vardata-directory: /var/information-coordinator-service
\ No newline at end of file
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.name.enrichmentservice" . }}-configmap
+ name: {{ include "common.name.informationservice" . }}-configmap
namespace: {{ include "common.namespace.nonrtric" . }}
labels:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
################################################################################
*/}}
-{{- if .Values.enrichmentservice.ingress.enabled -}}
+{{- if .Values.informationservice.ingress.enabled -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
- name: {{ include "common.name.enrichmentservice" . }}
+ name: {{ include "common.name.informationservice" . }}
namespace: {{ include "common.namespace.nonrtric" . }}
spec:
- path: "/data-producer"
backend:
service:
- name: {{ include "common.name.enrichmentservice" . }}
+ name: {{ include "common.name.informationservice" . }}
port:
- number: {{ .Values.enrichmentservice.service.internalPort1 }}
+ number: {{ .Values.informationservice.service.internalPort1 }}
pathType: Prefix
- path: "/data-consumer"
backend:
service:
- name: {{ include "common.name.enrichmentservice" . }}
+ name: {{ include "common.name.informationservice" . }}
port:
- number: {{ .Values.enrichmentservice.service.internalPort1 }}
+ number: {{ .Values.informationservice.service.internalPort1 }}
pathType: Prefix
{{- end -}}
\ No newline at end of file
kind: Service
apiVersion: v1
metadata:
- name: {{ include "common.name.enrichmentservice" . }}
+ name: {{ include "common.name.informationservice" . }}
namespace: {{ include "common.namespace.nonrtric" . }}
labels:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
ports:
- {{if eq .Values.enrichmentservice.service.allowHttp true -}}
- - name: {{ index .Values.enrichmentservice.service.httpName }}
- port: {{ .Values.enrichmentservice.service.internalPort1 }}
- targetPort: {{ .Values.enrichmentservice.service.targetPort1 }}
+ {{if eq .Values.informationservice.service.allowHttp true -}}
+ - name: {{ index .Values.informationservice.service.httpName }}
+ port: {{ .Values.informationservice.service.internalPort1 }}
+ targetPort: {{ .Values.informationservice.service.targetPort1 }}
protocol: TCP
{{- end }}
- - name: {{ index .Values.enrichmentservice.service.httpsName }}
- port: {{ .Values.enrichmentservice.service.internalPort2 }}
- targetPort: {{ .Values.enrichmentservice.service.targetPort2 }}
+ - name: {{ index .Values.informationservice.service.httpsName }}
+ port: {{ .Values.informationservice.service.internalPort2 }}
+ targetPort: {{ .Values.informationservice.service.targetPort2 }}
protocol: TCP
selector:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
release: {{ .Release.Name }}
type: ClusterIP
kind: StatefulSet
apiVersion: apps/v1
metadata:
- name: {{ include "common.name.enrichmentservice" . }}
+ name: {{ include "common.name.informationservice" . }}
namespace: {{ include "common.namespace.nonrtric" . }}
generation: 1
labels:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
deployment.kubernetes.io/revision: '1'
spec:
- serviceName: {{ include "common.name.enrichmentservice" . }}
+ serviceName: {{ include "common.name.informationservice" . }}
replicas: 1
selector:
matchLabels:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
- app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.enrichmentservice" . }}
+ app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
release: {{ .Release.Name }}
spec:
- hostname: {{ include "common.name.enrichmentservice" . }}
+ hostname: {{ include "common.name.informationservice" . }}
containers:
- - name: {{ include "common.container.enrichmentservice" . }}
- image: {{ .Values.enrichmentservice.image.registry }}/{{ .Values.enrichmentservice.image.name }}:{{ .Values.enrichmentservice.image.tag }}
- imagePullPolicy: {{ .Values.enrichmentservice.imagePullPolicy }}
+ - name: {{ include "common.container.informationservice" . }}
+ image: {{ .Values.informationservice.image.registry }}/{{ .Values.informationservice.image.name }}:{{ .Values.informationservice.image.tag }}
+ imagePullPolicy: {{ .Values.informationservice.imagePullPolicy }}
ports:
- - containerPort: {{ .Values.enrichmentservice.service.targetPort1 }}
+ - containerPort: {{ .Values.informationservice.service.targetPort1 }}
protocol: TCP
- - containerPort: {{ .Values.enrichmentservice.service.targetPort2 }}
+ - containerPort: {{ .Values.informationservice.service.targetPort2 }}
protocol: TCP
readinessProbe:
tcpSocket:
- port: {{ .Values.enrichmentservice.service.targetPort1 }}
- initialDelaySeconds: {{ .Values.enrichmentservice.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.enrichmentservice.liveness.periodSeconds }}
+ port: {{ .Values.informationservice.service.targetPort1 }}
+ initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
livenessProbe:
httpGet:
path: /status
- port: {{ .Values.enrichmentservice.service.targetPort1 }}
- initialDelaySeconds: {{ .Values.enrichmentservice.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.enrichmentservice.liveness.periodSeconds }}
+ port: {{ .Values.informationservice.service.targetPort1 }}
+ initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
volumeMounts:
- - name: {{ include "common.name.enrichmentservice" . }}-enrichment-config
- mountPath: /opt/app/enrichment-coordinator-service/config
- - name: {{ include "common.name.enrichmentservice" . }}-vardata
- mountPath: /var/enrichment-coordinator-service
+ - name: {{ include "common.name.informationservice" . }}-information-config
+ mountPath: /opt/app/information-coordinator-service/config
+ - name: {{ include "common.name.informationservice" . }}-vardata
+ mountPath: /var/information-coordinator-service
volumes:
- - name: {{ include "common.name.enrichmentservice" . }}-enrichment-config
+ - name: {{ include "common.name.informationservice" . }}-information-config
configMap:
- name: {{ include "common.name.enrichmentservice" . }}-configmap
+ name: {{ include "common.name.informationservice" . }}-configmap
volumeClaimTemplates:
- metadata:
- name: {{ include "common.name.enrichmentservice" . }}-vardata
+ name: {{ include "common.name.informationservice" . }}-vardata
spec:
accessModes: [ ReadWriteOnce ]
- storageClassName: "{{ .Values.enrichmentservice.persistence.storageClassName }}"
+ storageClassName: "{{ .Values.informationservice.persistence.storageClassName }}"
resources:
requests:
- storage: "{{ .Values.enrichmentservice.persistence.size }}"
+ storage: "{{ .Values.informationservice.persistence.size }}"
# limitations under the License. #
################################################################################
-# Default values for Enrichment Coordinate Service.
+# Default values for Information Coordinate Service.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
-enrichmentservice:
+informationservice:
imagePullPolicy: IfNotPresent
image:
registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
- name: "nonrtric-enrichment-coordinator-service"
+ name: "nonrtric-information-coordinator-service"
tag: 1.2.0
service:
allowHttp: true
repository: "@local"
condition: nonrtric.installPms
- - name: enrichmentservice
+ - name: informationservice
version: ~1.0.0
repository: "@local"
- condition: nonrtric.installEnrichmentservice
+ condition: nonrtric.installInformationservice
- name: nonrtric-common
version: ^2.0.0
version: ~1.0.0
repository: "@local"
condition: nonrtric.installDmaapadapterservice
+
+ - name: dmaapmediatorservice
+ version: ~1.0.0
+ repository: "@local"
+ condition: nonrtric.installDmaapmediatorservice
+
+ - name: helmmanager
+ version: ~1.0.0
+ repository: "@local"
+ condition: nonrtric.installHelmmanager
+
--- /dev/null
+###############################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+{{- if .Values.nonrtric.volume3.size }}
+
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+ name: nonrtric-pv3
+ namespace: {{ include "common.namespace.nonrtric" . }}
+spec:
+ capacity:
+ storage: {{ .Values.nonrtric.volume3.size }}
+ accessModes:
+ - ReadWriteOnce
+ - ReadWriteMany
+ persistentVolumeReclaimPolicy: Retain
+ hostPath:
+ path: /dockerdata-nfs/nonrtric/volume3
+ storageClassName: {{ .Values.nonrtric.volume3.storageClassName }}
+
+{{- end }}
+
installA1controller: true
installA1simulator: true
installControlpanel: true
- installEnrichmentservice: true
+ installInformationservice: true
installRappcatalogueservice: true
installNonrtricgateway: true
installDmaapadapterservice: true
+ installDmaapmediatorservice: true
+ installHelmmanager: true
volume1:
size: 1Gi
storageClassName: volume1
volume2:
size: 1Gi
- storageClassName: volume2
\ No newline at end of file
+ storageClassName: volume2
+ volume3:
+ size: 1Gi
+ storageClassName: volume3
\ No newline at end of file
predicates:
- Path=/a1-policy/**
- id: A1-EI
- uri: https://enrichmentservice:9083
+ uri: https://informationservice:9083
predicates:
- Path=/data-producer/**,/data-consumer/**
management:
image:
registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-gateway
- tag: 1.0.0
+ tag: 1.1.0
service:
httpName: http
internalPort1: 9090
image:
registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
name: nonrtric-policy-agent
- tag: 2.2.1
+ tag: 2.3.0
service:
allowHttp: true
httpName: http
rappcatalogueservice:
imagePullPolicy: IfNotPresent
image:
- registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+ registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
name: nonrtric-r-app-catalogue
- tag: 1.0.0
+ tag: 1.1.0
service:
allowHttp: true
httpName: http
internalPort1: 9080
- targetPort1: 8080
+ targetPort1: 8680
httpsName: https
internalPort2: 9081
- targetPort2: 8433
+ targetPort2: 8633
liveness:
initialDelaySeconds: 20
periodSeconds: 10
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+{{- define "common.name.dmaapmediatorservice" -}}
+ {{- printf "dmaapmediatorservice" -}}
+{{- end -}}
+
+{{- define "common.container.dmaapmediatorservice" -}}
+ {{- $name := ( include "common.name.dmaapmediatorservice" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
--- /dev/null
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# 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. #
+################################################################################
+
+{{- define "common.name.helmmanager" -}}
+ {{- printf "helmmanager" -}}
+{{- end -}}
+
+{{- define "common.container.helmmanager" -}}
+ {{- $name := ( include "common.name.helmmanager" . ) -}}
+ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
# limitations under the License. #
################################################################################
-{{- define "common.name.enrichmentservice" -}}
- {{- printf "enrichmentservice" -}}
+{{- define "common.name.informationservice" -}}
+ {{- printf "informationservice" -}}
{{- end -}}
-{{- define "common.container.enrichmentservice" -}}
- {{- $name := ( include "common.name.enrichmentservice" . ) -}}
+{{- define "common.container.informationservice" -}}
+ {{- $name := ( include "common.name.informationservice" . ) -}}
{{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Code Review / it / dep.git / commitdiff