Merge "Add path for EI Consumer"

diff --git a/.releases/container-release-nonrtric-enrichment-coordinator-service.yaml b/.releases/container-release-nonrtric-enrichment-coordinator-service.yaml
index d68088c..4437044 100644 (file)
--- a/.releases/container-release-nonrtric-enrichment-coordinator-service.yaml
+++ b/.releases/container-release-nonrtric-enrichment-coordinator-service.yaml
@@ -1,10 +1,10 @@
 ---
 distribution_type: container
-container_release_tag: 1.0.0
+container_release_tag: 1.1.0
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: nonrtric
-ref: 90ce16238dd6970153e1c0fbddb15e32c68c504f
+ref: d6624171da70a1c71e3d5b8263855fabf613a06e
 containers:
     - name: nonrtric-enrichment-coordinator-service
-      version: 1.0.0
\ No newline at end of file
+      version: 1.1.0

diff --git a/.releases/container-release-nonrtric-helm-manager.yaml b/.releases/container-release-nonrtric-helm-manager.yaml
new file mode 100644 (file)
index 0000000..518ae87
--- /dev/null
+++ b/.releases/container-release-nonrtric-helm-manager.yaml
@@ -0,0 +1,10 @@
+---
+distribution_type: container
+container_release_tag: 1.0.0
+container_pull_registry: nexus3.o-ran-sc.org:10004
+container_push_registry: nexus3.o-ran-sc.org:10002
+project: nonrtric
+ref: 8e8176d9618f928ec7f68c3e22823dd35e032add
+containers:
+    - name: nonrtric-helm-manager
+      version: 1.0.0

diff --git a/.releases/container-release-nonrtric-policy-agent.yaml b/.releases/container-release-nonrtric-policy-agent.yaml
index a80747d..d1b596b 100644 (file)
--- a/.releases/container-release-nonrtric-policy-agent.yaml
+++ b/.releases/container-release-nonrtric-policy-agent.yaml
@@ -1,10 +1,10 @@
 ---
 distribution_type: container
-container_release_tag: 2.1.0
+container_release_tag: 2.2.0
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: nonrtric
-ref: 90ce16238dd6970153e1c0fbddb15e32c68c504f
+ref: d6624171da70a1c71e3d5b8263855fabf613a06e
 containers:
     - name: nonrtric-policy-agent
-      version: 2.1.0
\ No newline at end of file
+      version: 2.2.0

diff --git a/.releases/maven-release-nonrtric-enrichment-coordinator-service.yaml b/.releases/maven-release-nonrtric-enrichment-coordinator-service.yaml
index 09a49c0..b571c11 100644 (file)
--- a/.releases/maven-release-nonrtric-enrichment-coordinator-service.yaml
+++ b/.releases/maven-release-nonrtric-enrichment-coordinator-service.yaml
@@ -1,5 +1,5 @@
 ---
 distribution_type: maven
-version: 1.0.0
+version: 1.1.0
 project: enrichment-coordinator-service
-log_dir: nonrtric-enrichment-coordinator-service-maven-stage-master/6/
\ No newline at end of file
+log_dir: nonrtric-enrichment-coordinator-service-maven-stage-master/204/

diff --git a/.releases/maven-release-nonrtric-policy-agent.yaml b/.releases/maven-release-nonrtric-policy-agent.yaml
index ea1c134..167156a 100644 (file)
--- a/.releases/maven-release-nonrtric-policy-agent.yaml
+++ b/.releases/maven-release-nonrtric-policy-agent.yaml
@@ -1,5 +1,5 @@
 ---
 distribution_type: maven
-version: 2.1.0
+version: 2.2.0
 project: nonrtric-policy-agent
-log_dir: nonrtric-policy-agent-maven-stage-master/188/
\ No newline at end of file
+log_dir: nonrtric-policy-agent-maven-stage-master/387/

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index b09dcfb..00cd797 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -10,12 +10,12 @@ Release-Notes
 This document provides the release notes for the release of the different parts of the Non-RT RIC.
 
 .. contents::
-   :depth: 3
+   :depth: 1
    :local:
 
 
-Version history A1 Policy Management Service
-============================================
+Version history A1 Policy Agent
+===============================
 
 +------------+----------+------------------+--------------------+
 | **Date**   | **Ver.** | **Author**       | **Comment**        |
@@ -35,11 +35,21 @@ Version history A1 Policy Management Service
 | 2020-12-03 | 2.1.0    | Henrik Andersson | Cherry Release     |
 |            |          |                  |                    |
 +------------+----------+------------------+--------------------+
+| 2021-06-23 | 2.2.0    | Henrik Andersson | D Release          |
+|            |          |                  |                    |
++------------+----------+------------------+--------------------+
+
 
+Version history Helm Manager
+============================
 
-Summary
--------
-Introduction of Enrichment Service Coordinator and rAPP Catalogue.
++------------+----------+------------------+-----------------+
+| **Date**   | **Ver.** | **Author**       | **Comment**     |
+|            |          |                  |                 |
++------------+----------+------------------+-----------------+
+| 2021-06-23 | 1.0.0    | Henrik Andersson | Initial version |
+|            |          |                  | D Release       |
++------------+----------+------------------+-----------------+
 
 
 Version history SDNC A1 Controller
@@ -67,44 +77,6 @@ Version history SDNC A1 Controller
 Release Data
 ============
 
-Amber
------
-+-----------------------------+---------------------------------------------------+
-| **Project**                 | Non-RT RIC                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Repo/commit-ID**          | nonrtric/ec3829493c0b71c5e5908a430edd1e493504178e |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release designation**     | Amber                                             |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release date**            | 2019-11-22                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Purpose of the delivery** | Introducing Non-RT RIC                            |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-
-Amber Maintenance
------------------
-+-----------------------------+---------------------------------------------------+
-| **Project**                 | Non-RT RIC                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Repo/commit-ID**          | nonrtric/08691d2192981c302a5528669fdb71e48cb3dcbc |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release designation**     | Amber Maintenance Release                         |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release date**            | 2020-02-03                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Purpose of the delivery** | Introducing Policy Agent and                      |
-|                             | updating to latest A1 spec                        |
-+-----------------------------+---------------------------------------------------+
-
 Bronze
 ------
 +-----------------------------+---------------------------------------------------+
@@ -162,3 +134,22 @@ Cherry
 |                             | and rAPP Catalogue                                |
 |                             |                                                   |
 +-----------------------------+---------------------------------------------------+
+
+D
+-
++-----------------------------+---------------------------------------------------+
+| **Project**                 | Non-RT RIC                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Repo/commit-ID**          | nonrtric/8e8176d9618f928ec7f68c3e22823dd35e032add |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release designation**     | D                                                 |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release date**            | 2021-06-23                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Purpose of the delivery** | Improvements                                      |
+|                             | Introduction of initial version of Helm Manager   |
++-----------------------------+---------------------------------------------------+

diff --git a/helm-manager/Dockerfile b/helm-manager/Dockerfile
index b9283c0..cd44c90 100644 (file)
--- a/helm-manager/Dockerfile
+++ b/helm-manager/Dockerfile
@@ -22,11 +22,12 @@ ARG JAR
 #Install curl
 RUN apt-get update
 RUN apt-get install -y curl
+RUN apt-get install -y wget
 
 #Install helm
-RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-RUN chmod 700 get_helm.sh
-RUN ./get_helm.sh
+RUN wget -O helm.tar.gz https://get.helm.sh/helm-v3.6.1-linux-amd64.tar.gz
+RUN tar -zxvf helm.tar.gz
+RUN mv linux-amd64/helm /usr/local/bin/helm
 
 #Install kubectl and configure
 RUN curl -LO https://dl.k8s.io/release/v1.20.2/bin/linux/amd64/kubectl

diff --git a/helm-manager/helm-manager.yaml b/helm-manager/helm-manager.yaml
index 093752e..f372b30 100644 (file)
--- a/helm-manager/helm-manager.yaml
+++ b/helm-manager/helm-manager.yaml
@@ -49,7 +49,7 @@ spec:
   serviceAccountName: helm-manager-sa
   containers:
   - name: helmmanagerservice
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.0.0-SNAPSHOT
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.0.0
     imagePullPolicy: Always
     ports:
     - name: http

diff --git a/helm-manager/pom.xml b/helm-manager/pom.xml
index 7de3d17..4a660ce 100644 (file)
--- a/helm-manager/pom.xml
+++ b/helm-manager/pom.xml
@@ -50,12 +50,16 @@
             <name>onap-snapshots</name>
             <url>https://nexus.onap.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>nordix</id>
+            <name>39bf7eabe020-releases</name>
+            <url>https://artifactory.nordix.org/artifactory/onap-policy-clamp-participant-maven-local</url>
+        </repository>
     </repositories>
     <properties>
         <!-- Update this when a new version of the dependency jar shall be included -->
-        <policy-clamp-participant-impl-kubernetes.version>6.1.2-SNAPSHOT</policy-clamp-participant-impl-kubernetes.version>
+        <policy-clamp-participant-impl-kubernetes.version>6.1.2</policy-clamp-participant-impl-kubernetes.version>
         <docker-maven-plugin.version>0.36.0</docker-maven-plugin.version>
-        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     </properties>
     <dependencies>
         <dependency>
@@ -70,7 +74,6 @@
                 <!-- Make the jar file of the dependency available as a file for inclusion in the docker image-->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>${maven-dependency-plugin.version}</version>
                 <executions>
                 <execution>
                     <id>copy</id>