Update SMo pack install with E-release 22/7422/3
authorsebdet <sebastien.determe@intl.att.com>
Fri, 17 Dec 2021 17:27:29 +0000 (18:27 +0100)
committerMartin Skorupski <martin.skorupski@highstreet-technologies.com>
Tue, 18 Jan 2022 00:11:24 +0000 (00:11 +0000)
All files from https://gerrit.o-ran-sc.org/r/c/it/dep/+/7291
have been updated

Issue-ID: NONRTRIC-622
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I62bff64ef68ff02701cb9c545d62da96e382f5de

48 files changed:
smo-install/helm-override/oran-override.yaml
smo-install/oran_oom/a1controller/templates/deployment.yaml
smo-install/oran_oom/a1controller/values.yaml
smo-install/oran_oom/a1simulator/values.yaml
smo-install/oran_oom/controlpanel/resources-ing/nginx.conf [new file with mode: 0644]
smo-install/oran_oom/controlpanel/resources-ngw/nginx.conf [new file with mode: 0644]
smo-install/oran_oom/controlpanel/templates/configmap.yaml
smo-install/oran_oom/controlpanel/values.yaml
smo-install/oran_oom/dmaapadapterservice/resources/config/application.yaml
smo-install/oran_oom/dmaapadapterservice/resources/data/application_configuration.json
smo-install/oran_oom/dmaapadapterservice/values.yaml
smo-install/oran_oom/dmaapmediatorservice/.helmignore [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/Chart.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/requirements.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/resources/config/application.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/resources/data/type_config.json [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml [new file with mode: 0644]
smo-install/oran_oom/dmaapmediatorservice/values.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/.helmignore [new file with mode: 0644]
smo-install/oran_oom/helmmanager/Chart.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/requirements.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/templates/service.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/templates/statefulset.yaml [new file with mode: 0644]
smo-install/oran_oom/helmmanager/values.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/.helmignore [new file with mode: 0644]
smo-install/oran_oom/informationservice/Chart.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/requirements.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/resources/config/application.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/templates/configmap.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/templates/ingress.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/templates/service.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/templates/statefulset.yaml [new file with mode: 0644]
smo-install/oran_oom/informationservice/values.yaml [new file with mode: 0644]
smo-install/oran_oom/nonrtric-common/templates/_dmaapmediatorservice.tpl [new file with mode: 0644]
smo-install/oran_oom/nonrtric-common/templates/_helmmanager.tpl [new file with mode: 0644]
smo-install/oran_oom/nonrtric-common/templates/_informationservice.tpl [new file with mode: 0644]
smo-install/oran_oom/nonrtric/Chart.yaml
smo-install/oran_oom/nonrtric/requirements.yaml
smo-install/oran_oom/nonrtric/templates/pv3.yaml [new file with mode: 0644]
smo-install/oran_oom/nonrtric/values.yaml
smo-install/oran_oom/nonrtricgateway/resources/config/application.yaml
smo-install/oran_oom/nonrtricgateway/values.yaml
smo-install/oran_oom/policymanagementservice/values.yaml
smo-install/oran_oom/rappcatalogueservice/values.yaml
smo-install/scripts/sub-scripts/uninstall-nonrtric.sh

index f607b78..caa5685 100644 (file)
@@ -29,13 +29,15 @@ nonrtric:
   installA1controller: false
   installA1simulator: true
   installControlpanel: true
-  installEnrichmentservice: true
+  installInformationservice: true
   installRappcatalogueservice: true
   installNonrtricgateway: true
   installKong: true
   installORUApp: true
   installTopology: true
   installDmaapadapterservice: true
+  installDmaapmediatorservice: true
+  installHelmmanager: true
   # override default mount path root directory
   # referenced by persistent volumes and log files
   persistence:
@@ -47,18 +49,25 @@ nonrtric:
   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 
   ingressClassName: kong 
-enrichmentservice: 
-  enrichmentservice: 
-    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) 
-      size: 2Gi 
-      storageClassName: ecs-storage 
+
+informationservice:
+  informationservice:
+    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: 2Gi
+      storageClassName: ics-storage
+    ingress:
+      enabled: true
+
  
 # Need to check the external port Availability 
 policymanagementservice: 
@@ -68,6 +77,8 @@ policymanagementservice:
       # 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) 
       size: 2Gi 
       storageClassName: pms-storage 
+  ingress:
+    enabled: true
 
 kong:
   ingressController:
@@ -75,6 +86,18 @@ kong:
   admin:
     enabled: true
 
+helmmanager:
+  helmmanager:
+    persistence:
+      # Either refer to a volume created under the nonrtric by storageClassName. Then the claimed si>
+      # The alternative use a dynamic volume provisioner in the cluster. Storage class can then be f>
+      storageClassName: helmmanager-storage
+
+controlpanel:
+  controlpanel:
+    ingress:
+      enabled: false
+
 oru-app:
   simulators:
     - simRu: o-ru-11221
index c5eb596..86bc466 100644 (file)
@@ -44,11 +44,6 @@ spec:
         - 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:
@@ -56,6 +51,35 @@ spec:
               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 }}
@@ -85,12 +109,12 @@ spec:
     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
+            - containerPort: 3306
index 491c52d..28bd09c 100644 (file)
@@ -20,9 +20,9 @@
 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
index 059fa99..608916e 100644 (file)
@@ -1,8 +1,8 @@
 # Static Defaults
 image:
-  repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+  repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
   name: a1-simulator
-  tag: 2.1.0
+  tag: 2.2.0
   pullPolicy: IfNotPresent
 
 service:
diff --git a/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf b/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf
new file mode 100644 (file)
index 0000000..374861f
--- /dev/null
@@ -0,0 +1,25 @@
+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;
+        }
+    }
+}
diff --git a/smo-install/oran_oom/controlpanel/resources-ngw/nginx.conf b/smo-install/oran_oom/controlpanel/resources-ngw/nginx.conf
new file mode 100644 (file)
index 0000000..e8ec1b3
--- /dev/null
@@ -0,0 +1,25 @@
+events{}
+http {
+    include /etc/nginx/mime.types;
+    upstream backend {
+        server  nonrtricgateway:9090;
+    }
+    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;
+        }
+    }
+}
index e351ce9..cf0f7da 100644 (file)
@@ -25,4 +25,8 @@ metadata:
     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 }}
index 397633f..b08120c 100644 (file)
@@ -23,7 +23,7 @@ controlpanel:
   image:
     registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
     name: nonrtric-controlpanel
-    tag: 2.2.0
+    tag: 2.3.0
   replicaCount: 1
   service:
     allowHttp: true
@@ -41,3 +41,6 @@ controlpanel:
   readiness:
     initialDelaySeconds: 20
     periodSeconds: 10
+
+  ingress:
+    enabled: true
index 2067a81..2730af8 100644 (file)
@@ -25,18 +25,23 @@ management:
   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:
@@ -47,13 +52,23 @@ server:
       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
+  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
index a8967d8..137e353 100644 (file)
@@ -2,7 +2,13 @@
    "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
+    }
    ]
-}
+ }
index 123b2b7..3260e26 100644 (file)
@@ -21,7 +21,7 @@
 dmaapadapterservice:
   imagePullPolicy: IfNotPresent
   image:
-    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: "nonrtric-dmaap-adaptor"
     tag: 1.0.0
   service:
diff --git a/smo-install/oran_oom/dmaapmediatorservice/.helmignore b/smo-install/oran_oom/dmaapmediatorservice/.helmignore
new file mode 100644 (file)
index 0000000..50af031
--- /dev/null
@@ -0,0 +1,22 @@
+# 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/
diff --git a/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml b/smo-install/oran_oom/dmaapmediatorservice/Chart.yaml
new file mode 100644 (file)
index 0000000..37ec9cd
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2020 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
diff --git a/smo-install/oran_oom/dmaapmediatorservice/requirements.yaml b/smo-install/oran_oom/dmaapmediatorservice/requirements.yaml
new file mode 100644 (file)
index 0000000..f3b3ecd
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2020 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"
diff --git a/smo-install/oran_oom/dmaapmediatorservice/resources/config/application.yaml b/smo-install/oran_oom/dmaapmediatorservice/resources/config/application.yaml
new file mode 100644 (file)
index 0000000..75b11ad
--- /dev/null
@@ -0,0 +1,54 @@
+################################################################################
+#   Copyright (c) 2020 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.                                             #
+################################################################################
+
+spring:
+  profiles:
+    active: prod
+  main:
+    allow-bean-definition-overriding: true
+  aop:
+    auto: false
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+
+logging:
+  level:
+    ROOT: ERROR
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+    org.oransc.enrichment: INFO
+  file:
+    name: /var/log/enrichment-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-password: policy_agent
+      key-alias: policy_agent
+app:
+  filepath: /opt/app/enrichment-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
diff --git a/smo-install/oran_oom/dmaapmediatorservice/resources/data/type_config.json b/smo-install/oran_oom/dmaapmediatorservice/resources/data/type_config.json
new file mode 100644 (file)
index 0000000..cf3855a
--- /dev/null
@@ -0,0 +1,9 @@
+{
+   "types":
+     [
+       {
+         "id": "STD_Fault_Messages",
+         "dmaapTopicUrl": "/events/unauthenticated.dmaapmed.json/dmaapmediatorproducer/STD_Fault_Messages?timeout=15000&limit=100"
+       }
+   ]
+ }
diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/configmap.yaml
new file mode 100644 (file)
index 0000000..8958996
--- /dev/null
@@ -0,0 +1,29 @@
+################################################################################
+#   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 }}
diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/service.yaml
new file mode 100644 (file)
index 0000000..d09fde4
--- /dev/null
@@ -0,0 +1,42 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
new file mode 100644 (file)
index 0000000..ad74f8d
--- /dev/null
@@ -0,0 +1 @@
+################################################################################\r#   Copyright (c) 2021 Nordix Foundation.                                      #\r#                                                                              #\r#   Licensed under the Apache License, Version 2.0 (the "License");            #\r#   you may not use this file except in compliance with the License.           #\r#   You may obtain a copy of the License at                                    #\r#                                                                              #\r#       http://www.apache.org/licenses/LICENSE-2.0                             #\r#                                                                              #\r#   Unless required by applicable law or agreed to in writing, software        #\r#   distributed under the License is distributed on an "AS IS" BASIS,          #\r#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #\r#   See the License for the specific language governing permissions and        #\r#   limitations under the License.                                             #\r################################################################################\r\rkind: StatefulSet\rapiVersion: apps/v1\rmetadata:\r  name: {{ include "common.name.dmaapmediatorservice" . }}\r  namespace: {{ include "common.namespace.nonrtric" . }}\r  generation: 1\r  labels:\r    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}\r    release: {{ .Release.Name }}\r    heritage: {{ .Release.Service }}\r  annotations:\r    deployment.kubernetes.io/revision: '1'\rspec:\r  serviceName: {{ include "common.name.dmaapmediatorservice" . }}\r  replicas: 1\r  selector:\r    matchLabels:\r      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r      release: {{ .Release.Name }}\r  template:\r    metadata:\r      labels:\r        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r        release: {{ .Release.Name }}\r    spec:\r      hostname: {{ include "common.name.dmaapmediatorservice" . }}\r      containers:\r      - name: {{ include "common.container.dmaapmediatorservice" . }}\r        image: {{ .Values.dmaapmediatorservice.image.registry }}/{{ .Values.dmaapmediatorservice.image.name }}:{{ .Values.dmaapmediatorservice.image.tag }}\r        imagePullPolicy: {{ .Values.dmaapmediatorservice.imagePullPolicy }}\r        ports:\r        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }}\r          protocol: TCP\r        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}\r          protocol: TCP\r        # Temporarily disabled probes due to no http available in the container\r        # readinessProbe:\r        #   tcpSocket:\r        #     port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}\r        #   initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}\r        #   periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}\r        # livenessProbe:\r        #   tcpSocket:\r        #     port: {{ .Values.dmaapmediatorservice.service.targetPort1 }}\r        #   initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}\r        #   periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}\r        volumeMounts:\r        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data\r          mountPath: /configs/type_config.json\r          subPath: type_config.json\r\r        env:\r          - name: INFO_PRODUCER_HOST\r            value: https://{{ include "common.name.dmaapmediatorservice" . }}\r          - name: INFO_PRODUCER_PORT\r            value: "{{ .Values.dmaapmediatorservice.service.internalPort2 }}"\r          - name: INFO_COORD_ADDR\r            value: https://informationservice:9083\r          - name: DMAAP_MR_ADDR\r            value: https://message-router.onap:3905\r          - name: LOG_LEVEL\r            value: Info\r      volumes:\r        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data\r          configMap:\r            name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data\r
\ No newline at end of file
diff --git a/smo-install/oran_oom/dmaapmediatorservice/values.yaml b/smo-install/oran_oom/dmaapmediatorservice/values.yaml
new file mode 100644 (file)
index 0000000..4a32b42
--- /dev/null
@@ -0,0 +1,40 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/helmmanager/.helmignore b/smo-install/oran_oom/helmmanager/.helmignore
new file mode 100644 (file)
index 0000000..50af031
--- /dev/null
@@ -0,0 +1,22 @@
+# 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/
diff --git a/smo-install/oran_oom/helmmanager/Chart.yaml b/smo-install/oran_oom/helmmanager/Chart.yaml
new file mode 100644 (file)
index 0000000..46af0d5
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/helmmanager/requirements.yaml b/smo-install/oran_oom/helmmanager/requirements.yaml
new file mode 100644 (file)
index 0000000..7bd421f
--- /dev/null
@@ -0,0 +1,19 @@
+################################################################################
+#   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"
diff --git a/smo-install/oran_oom/helmmanager/templates/service.yaml b/smo-install/oran_oom/helmmanager/templates/service.yaml
new file mode 100644 (file)
index 0000000..90ae614
--- /dev/null
@@ -0,0 +1,35 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml b/smo-install/oran_oom/helmmanager/templates/serviceaccount.yaml
new file mode 100644 (file)
index 0000000..60c081d
--- /dev/null
@@ -0,0 +1,43 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/helmmanager/templates/statefulset.yaml b/smo-install/oran_oom/helmmanager/templates/statefulset.yaml
new file mode 100644 (file)
index 0000000..668ac5f
--- /dev/null
@@ -0,0 +1,74 @@
+################################################################################
+#   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 }}"
diff --git a/smo-install/oran_oom/helmmanager/values.yaml b/smo-install/oran_oom/helmmanager/values.yaml
new file mode 100644 (file)
index 0000000..1cd1c14
--- /dev/null
@@ -0,0 +1,40 @@
+################################################################################
+#   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
diff --git a/smo-install/oran_oom/informationservice/.helmignore b/smo-install/oran_oom/informationservice/.helmignore
new file mode 100644 (file)
index 0000000..50af031
--- /dev/null
@@ -0,0 +1,22 @@
+# 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/
diff --git a/smo-install/oran_oom/informationservice/Chart.yaml b/smo-install/oran_oom/informationservice/Chart.yaml
new file mode 100644 (file)
index 0000000..610411b
--- /dev/null
@@ -0,0 +1,21 @@
+################################################################################
+#   Copyright (c) 2020 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 Information Coordinator Service
+name: informationservice
+version: 1.0.0
diff --git a/smo-install/oran_oom/informationservice/requirements.yaml b/smo-install/oran_oom/informationservice/requirements.yaml
new file mode 100644 (file)
index 0000000..f3b3ecd
--- /dev/null
@@ -0,0 +1,20 @@
+################################################################################
+#   Copyright (c) 2020 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"
diff --git a/smo-install/oran_oom/informationservice/resources/config/application.yaml b/smo-install/oran_oom/informationservice/resources/config/application.yaml
new file mode 100644 (file)
index 0000000..38bf7f0
--- /dev/null
@@ -0,0 +1,58 @@
+################################################################################
+#   Copyright (c) 2020 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.                                             #
+################################################################################
+
+spring:
+  profiles:
+    active: prod
+  main:
+    allow-bean-definition-overriding: true
+  aop:
+    auto: false
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+
+logging:
+  level:
+    ROOT: ERROR
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+    org.oransc.information: INFO
+  file:
+    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/information-coordinator-service/etc/cert/keystore.jks
+      key-password: policy_agent
+      key-alias: policy_agent
+app:
+  filepath: /opt/app/information-coordinator-service/data/application_configuration.json
+  webclient:
+    trust-store-used: false
+    trust-store-password: policy_agent
+    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
diff --git a/smo-install/oran_oom/informationservice/templates/configmap.yaml b/smo-install/oran_oom/informationservice/templates/configmap.yaml
new file mode 100644 (file)
index 0000000..4d4df9f
--- /dev/null
@@ -0,0 +1,29 @@
+################################################################################
+#   Copyright (c) 2020 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.informationservice" . }}-configmap
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/smo-install/oran_oom/informationservice/templates/ingress.yaml b/smo-install/oran_oom/informationservice/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..d872407
--- /dev/null
@@ -0,0 +1,45 @@
+{{/*
+################################################################################
+#   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.informationservice.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "common.name.informationservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+
+spec:
+  ingressClassName: {{ include "common.ingressClassName" . }}
+  rules:
+    - http:
+        paths:
+          - path: "/data-producer"
+            backend:
+              service:
+                name: {{ include "common.name.informationservice" . }}
+                port:
+                  number: {{ .Values.informationservice.service.internalPort1 }}
+            pathType: Prefix
+          - path: "/data-consumer"
+            backend:
+              service:
+                name: {{ include "common.name.informationservice" . }}
+                port:
+                  number: {{ .Values.informationservice.service.internalPort1 }}
+            pathType: Prefix
+{{- end -}}
diff --git a/smo-install/oran_oom/informationservice/templates/service.yaml b/smo-install/oran_oom/informationservice/templates/service.yaml
new file mode 100644 (file)
index 0000000..ba5783c
--- /dev/null
@@ -0,0 +1,42 @@
+################################################################################
+#   Copyright (c) 2020 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.informationservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    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.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.informationservice.service.httpsName }}
+      port: {{ .Values.informationservice.service.internalPort2 }}
+      targetPort: {{ .Values.informationservice.service.targetPort2 }}
+      protocol: TCP
+  selector:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP
diff --git a/smo-install/oran_oom/informationservice/templates/statefulset.yaml b/smo-install/oran_oom/informationservice/templates/statefulset.yaml
new file mode 100644 (file)
index 0000000..a597324
--- /dev/null
@@ -0,0 +1,82 @@
+################################################################################
+#   Copyright (c) 2020 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.informationservice" . }}
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  generation: 1
+  labels:
+    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.informationservice" . }}
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.informationservice" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.informationservice" . }}
+      containers:
+      - 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.informationservice.service.targetPort1 }}
+          protocol: TCP
+        - containerPort: {{ .Values.informationservice.service.targetPort2 }}
+          protocol: TCP
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.informationservice.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
+        livenessProbe:
+          httpGet:
+            path: /status
+            port: {{ .Values.informationservice.service.targetPort1 }}
+          initialDelaySeconds: {{ .Values.informationservice.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.informationservice.liveness.periodSeconds }}
+        volumeMounts:
+        - 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.informationservice" . }}-information-config
+          configMap:
+            name: {{ include "common.name.informationservice" . }}-configmap
+
+  volumeClaimTemplates:
+    - metadata:
+        name: {{ include "common.name.informationservice" . }}-vardata
+      spec:
+        accessModes: [ ReadWriteOnce ]
+        storageClassName: "{{ .Values.informationservice.persistence.storageClassName }}"
+        resources:
+          requests:
+            storage: "{{ .Values.informationservice.persistence.size }}"
diff --git a/smo-install/oran_oom/informationservice/values.yaml b/smo-install/oran_oom/informationservice/values.yaml
new file mode 100644 (file)
index 0000000..e998656
--- /dev/null
@@ -0,0 +1,45 @@
+################################################################################
+#   Copyright (c) 2020 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 Information Coordinate Service.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+informationservice:
+  imagePullPolicy: IfNotPresent
+  image:
+    registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+    name: "nonrtric-information-coordinator-service"
+    tag: 1.2.0
+  service:
+    allowHttp: true
+    httpName: http
+    internalPort1: 9082
+    targetPort1: 8083
+    httpsName: https
+    internalPort2: 9083
+    targetPort2: 8434
+  liveness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+  readiness:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+  persistence:
+    size: 2Gi
+    storageClassName: standard
+  ingress:
+    enabled: false
diff --git a/smo-install/oran_oom/nonrtric-common/templates/_dmaapmediatorservice.tpl b/smo-install/oran_oom/nonrtric-common/templates/_dmaapmediatorservice.tpl
new file mode 100644 (file)
index 0000000..d31d0c8
--- /dev/null
@@ -0,0 +1,23 @@
+################################################################################
+#   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 -}}
+
diff --git a/smo-install/oran_oom/nonrtric-common/templates/_helmmanager.tpl b/smo-install/oran_oom/nonrtric-common/templates/_helmmanager.tpl
new file mode 100644 (file)
index 0000000..736bff3
--- /dev/null
@@ -0,0 +1,24 @@
+################################################################################
+#   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 -}}
diff --git a/smo-install/oran_oom/nonrtric-common/templates/_informationservice.tpl b/smo-install/oran_oom/nonrtric-common/templates/_informationservice.tpl
new file mode 100644 (file)
index 0000000..bb686b2
--- /dev/null
@@ -0,0 +1,22 @@
+################################################################################
+#   Copyright (c) 2020 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.informationservice" -}}
+  {{- printf "informationservice" -}}
+{{- end -}}
+{{- define "common.container.informationservice" -}}
+  {{- $name := ( include "common.name.informationservice" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
index df4f747..ae89fa7 100644 (file)
@@ -3,8 +3,7 @@ name: nonrtric
 version: 1.0.0
 appVersion: test
 description: Open Radio Access Network (ORAN)
-home: https://www.onap.org/
+home: https://www.o-ran.org/
 sources:
 - https://gerrit.o-ran-sc.org/r/#/admin/projects/
-icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
-kubeVersion: ">=1.11.5-0"
+kubeVersion: ">=1.19.0-0"
index a2d81b9..29517b2 100644 (file)
@@ -35,10 +35,10 @@ dependencies:
     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
@@ -64,6 +64,16 @@ dependencies:
     repository: "@local"
     condition: nonrtric.installTopology
 
+  - name: dmaapmediatorservice
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installDmaapmediatorservice
+
+  - name: helmmanager
+    version: ~1.0.0
+    repository: "@local"
+    condition: nonrtric.installHelmmanager
+
   - name: kong
     version: ~2.4.0
     repository: https://nexus3.o-ran-sc.org/repository/helm-konghq/
@@ -77,4 +87,4 @@ dependencies:
   - name: cert-wrapper
     version: ~9.x-0
     repository: '@local'
-    condition: cert-wrapper.enabled
\ No newline at end of file
+    condition: cert-wrapper.enabled
diff --git a/smo-install/oran_oom/nonrtric/templates/pv3.yaml b/smo-install/oran_oom/nonrtric/templates/pv3.yaml
new file mode 100644 (file)
index 0000000..c0382f0
--- /dev/null
@@ -0,0 +1,36 @@
+###############################################################################
+#   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 }}
+
index 568e125..d258857 100644 (file)
@@ -21,23 +21,30 @@ nonrtric:
   installA1controller: true
   installA1simulator: true
   installControlpanel: true
-  installEnrichmentservice: true
+  installInformationservice: true
   installRappcatalogueservice: true
   installNonrtricgateway: true
   installORUApp: true
   installTopology: true
   installKong: true
   installDmaapadapterservice: true
+  installDmaapmediatorservice: true
+  installHelmmanager: true
+
   volume1:
     size: 1Gi
     storageClassName: volume1
   volume2:
     size: 1Gi
     storageClassName: volume2
+  volume3:
+    size: 1Gi
+    storageClassName: volume3
+
 kong:
   ingressController:
     installCRDs: false 
   admin:
     enabled: true
 cert-wrapper:
-  enabled: true
\ No newline at end of file
+  enabled: true
index 2dd4052..e70ae12 100644 (file)
@@ -31,7 +31,7 @@ spring:
         predicates:
         - Path=/a1-policy/**
       - id: A1-EI
-        uri: https://enrichmentservice:8434
+        uri: https://informationservice:9083
         predicates:
         - Path=/data-producer/**,/data-consumer/**
 management:
@@ -49,4 +49,4 @@ logging:
     org.springframework.cloud.gateway: INFO
     reactor.netty: INFO
   file:
-    name: /var/log/nonrtric-gateway/application.log
\ No newline at end of file
+    name: /var/log/nonrtric-gateway/application.log
index 80ffe37..a66a941 100644 (file)
@@ -35,4 +35,4 @@ nonrtricgateway:
   readiness:
     initialDelaySeconds: 20
     periodSeconds: 10
-a1PolicyLink: https://a1policymanagement.onap:8433
\ No newline at end of file
+a1PolicyLink: https://a1policymanagement.onap:8433
index 637e660..e5fc835 100644 (file)
@@ -23,7 +23,7 @@ policymanagementservice:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: nonrtric-policy-agent
-    tag: 2.2.1
+    tag: 2.3.0
   service:
     type: NodePort
     allowHttp: true
index d939ac3..64e6265 100644 (file)
 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: 9085
-    targetPort1: 8080
+    targetPort1: 8680
     httpsName: https
     internalPort2: 9086
-    targetPort2: 8433
+    targetPort2: 8633
   liveness:
     initialDelaySeconds: 20
     periodSeconds: 10
index 61a87e7..5835382 100755 (executable)
@@ -26,3 +26,4 @@
 kubectl delete namespace nonrtric
 kubectl delete pv nonrtric-pv2
 kubectl delete pv nonrtric-pv1
+kubectl delete pv nonrtric-pv3