Merge "[COMMON] Bump ONAP version"

3 files changed, 68 insertions, 67 deletions

diff --git a/docs/helm/helm-search.txt b/docs/helm/helm-search.txt
index 4e357b6dc8..75c274957b 100644
--- a/docs/helm/helm-search.txt
+++ b/docs/helm/helm-search.txt
@@ -1,42 +1,42 @@
 NAME                    CHART VERSION    APP VERSION    DESCRIPTION
-local/onap                    10.0.0     Jakarta        Open Network Automation Platform (ONAP)
-local/aaf                     10.0.0                    ONAP Application Authorization Framework
-local/aai                     10.0.0                    ONAP Active and Available Inventory
-local/appc                    10.0.0                    Application Controller
-local/cassandra               10.0.0                    ONAP cassandra
-local/cds                     10.0.0                    ONAP Controller Design Studio (CDS)
-local/clamp                   10.0.0                    ONAP Clamp
-local/cli                     10.0.0                    ONAP Command Line Interface
-local/common                  10.0.0                    Common templates for inclusion in other charts
-local/consul                  10.0.0                    ONAP Consul Agent
-local/contrib                 10.0.0                    ONAP optional tools
-local/cps                     10.0.0                    ONAP Configuration Persistene Service (CPS)
-local/dcaegen2                10.0.0                    ONAP DCAE Gen2
-local/dgbuilder               10.0.0                    D.G. Builder application
-local/dmaap                   10.0.0                    ONAP DMaaP components
-local/log                     10.0.0                    ONAP Logging ElasticStack
-local/mariadb-galera          10.0.0                    Chart for MariaDB Galera cluster
-local/mongo                   10.0.0                    MongoDB Server
-local/msb                     10.0.0                    ONAP MicroServices Bus
-local/multicloud              10.0.0                    ONAP multicloud broker
-local/music                   10.0.0                    MUSIC - Multi-site State Coordination Service
-local/mysql                   10.0.0                    MySQL Server
-local/nbi                     10.0.0                    ONAP Northbound Interface
-local/network-name-gen        10.0.0                    Name Generation Micro Service
-local/nfs-provisioner         10.0.0                    NFS provisioner
-local/oof                     10.0.0                    ONAP Optimization Framework
-local/policy                  10.0.0                    ONAP Policy Administration Point
-local/pomba                   10.0.0                    ONAP Post Orchestration Model Based Audit
-local/portal                  10.0.0                    ONAP Web Portal
-local/postgres                10.0.0                    ONAP Postgres Server
-local/robot                   10.0.0                    A helm Chart for kubernetes-ONAP Robot
-local/sdc                     10.0.0                    Service Design and Creation Umbrella Helm charts
-local/sdnc                    10.0.0                    SDN Controller
-local/sdnc-prom               10.0.0                    ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator          10.0.0                    ONAP Mock Sniro Emulator
-local/so                      10.0.0                    ONAP Service Orchestrator
-local/strimzi                 10.0.0                    ONAP Strimzi Apache Kafka
-local/uui                     10.0.0                    ONAP uui
-local/vfc                     10.0.0                    ONAP Virtual Function Controller (VF-C)
-local/vid                     10.0.0                    ONAP Virtual Infrastructure Deployment
-local/vnfsdk                  10.0.0                    ONAP VNF SDK
+local/onap                    11.0.0     Kohn           Open Network Automation Platform (ONAP)
+local/aaf                     11.0.0                    ONAP Application Authorization Framework
+local/aai                     11.0.0                    ONAP Active and Available Inventory
+local/appc                    11.0.0                    Application Controller
+local/cassandra               11.0.0                    ONAP cassandra
+local/cds                     11.0.0                    ONAP Controller Design Studio (CDS)
+local/clamp                   11.0.0                    ONAP Clamp
+local/cli                     11.0.0                    ONAP Command Line Interface
+local/common                  11.0.0                    Common templates for inclusion in other charts
+local/consul                  11.0.0                    ONAP Consul Agent
+local/contrib                 11.0.0                    ONAP optional tools
+local/cps                     11.0.0                    ONAP Configuration Persistene Service (CPS)
+local/dcaegen2                11.0.0                    ONAP DCAE Gen2
+local/dgbuilder               11.0.0                    D.G. Builder application
+local/dmaap                   11.0.0                    ONAP DMaaP components
+local/log                     11.0.0                    ONAP Logging ElasticStack
+local/mariadb-galera          11.0.0                    Chart for MariaDB Galera cluster
+local/mongo                   11.0.0                    MongoDB Server
+local/msb                     11.0.0                    ONAP MicroServices Bus
+local/multicloud              11.0.0                    ONAP multicloud broker
+local/music                   11.0.0                    MUSIC - Multi-site State Coordination Service
+local/mysql                   11.0.0                    MySQL Server
+local/nbi                     11.0.0                    ONAP Northbound Interface
+local/network-name-gen        11.0.0                    Name Generation Micro Service
+local/nfs-provisioner         11.0.0                    NFS provisioner
+local/oof                     11.0.0                    ONAP Optimization Framework
+local/policy                  11.0.0                    ONAP Policy Administration Point
+local/pomba                   11.0.0                    ONAP Post Orchestration Model Based Audit
+local/portal                  11.0.0                    ONAP Web Portal
+local/postgres                11.0.0                    ONAP Postgres Server
+local/robot                   11.0.0                    A helm Chart for kubernetes-ONAP Robot
+local/sdc                     11.0.0                    Service Design and Creation Umbrella Helm charts
+local/sdnc                    11.0.0                    SDN Controller
+local/sdnc-prom               11.0.0                    ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator          11.0.0                    ONAP Mock Sniro Emulator
+local/so                      11.0.0                    ONAP Service Orchestrator
+local/strimzi                 11.0.0                    ONAP Strimzi Apache Kafka
+local/uui                     11.0.0                    ONAP uui
+local/vfc                     11.0.0                    ONAP Virtual Function Controller (VF-C)
+local/vid                     11.0.0                    ONAP Virtual Infrastructure Deployment
+local/vnfsdk                  11.0.0                    ONAP VNF SDK
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 27d7a063e8..b7749b1056 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -29,6 +29,7 @@ where <BRANCH> can be an official release tag, such as
 * 8.0.0 for Honolulu
 * 9.0.0 for Istanbul
 * 10.0.0 for Jakarta
+* 11.0.0 for Kohn
 
 **Step 2.** Install Helm Plugins required to deploy ONAP::
 
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 0835a93c75..2ff74b5898 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -123,7 +123,7 @@ stable which should be removed to avoid confusion::
 
 To prepare your system for an installation of ONAP, you'll need to::
 
-  > git clone -b jakarta --recurse-submodules -j2 http://gerrit.onap.org/r/oom
+  > git clone -b kohn --recurse-submodules -j2 http://gerrit.onap.org/r/oom
   > cd oom/kubernetes
 
 
@@ -161,12 +161,12 @@ system, and looks for matches::
 
   > helm search repo local
   NAME                    VERSION    DESCRIPTION
-  local/appc              10.0.0     Application Controller
-  local/clamp             10.0.0     ONAP Clamp
-  local/common            10.0.0     Common templates for inclusion in other charts
-  local/onap              10.0.0     Open Network Automation Platform (ONAP)
-  local/robot             10.0.0     A helm Chart for kubernetes-ONAP Robot
-  local/so                10.0.0     ONAP Service Orchestrator
+  local/appc              11.0.0     Application Controller
+  local/clamp             11.0.0     ONAP Clamp
+  local/common            11.0.0     Common templates for inclusion in other charts
+  local/onap              11.0.0     Open Network Automation Platform (ONAP)
+  local/robot             11.0.0     A helm Chart for kubernetes-ONAP Robot
+  local/so                11.0.0     ONAP Service Orchestrator
 
 In any case, setup of the Helm repository is a one time activity.
 
@@ -209,7 +209,7 @@ deployment::
 To install a specific version of a single ONAP component (`so` in this example)
 with the given release name enter::
 
-  > helm deploy so onap/so --version 10.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
+  > helm deploy so onap/so --version 11.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
 
 .. note::
    The dependent components should be installed for component being installed
@@ -333,7 +333,7 @@ Here is an excerpt of this file:
   dependencies:
   <...>
     - name: so
-      version: ~10.0.0
+      version: ~11.0.0
       repository: '@local'
       condition: so.enabled
   <...>
@@ -404,7 +404,7 @@ corresponds to the private IP as follows::
   portal-app  LoadBalancer   10.43.142.201   10.0.0.4   8989:30215/TCP,8006:30213/TCP,8010:30214/TCP   1d   app=portal-app,release=dev
 
 
-In this example, use the 10.0.0.4 private address as a key find the
+In this example, use the 11.0.0.4 private address as a key find the
 corresponding public address which in this example is 10.12.6.155. If you're
 using OpenStack you'll do the lookup with the horizon GUI or the OpenStack CLI
 for your tenant (openstack server list).  That IP is then used in your
@@ -563,10 +563,10 @@ Below is the example for the same::
 
   > helm list
     NAME                    REVISION        UPDATED                         STATUS          CHART                   APP VERSION     NAMESPACE
-    dev                     1               Wed Oct 14 13:49:52 2020        DEPLOYED        onap-10.0.0             Jakarta          onap
-    dev-cassandra           5               Thu Oct 15 14:45:34 2020        DEPLOYED        cassandra-10.0.0                         onap
-    dev-contrib             1               Wed Oct 14 13:52:53 2020        DEPLOYED        contrib-10.0.0                           onap
-    dev-mariadb-galera      1               Wed Oct 14 13:55:56 2020        DEPLOYED        mariadb-galera-10.0.0                    onap
+    dev                     1               Wed Oct 14 13:49:52 2020        DEPLOYED        onap-11.0.0             Kohn          onap
+    dev-cassandra           5               Thu Oct 15 14:45:34 2020        DEPLOYED        cassandra-11.0.0                         onap
+    dev-contrib             1               Wed Oct 14 13:52:53 2020        DEPLOYED        contrib-11.0.0                           onap
+    dev-mariadb-galera      1               Wed Oct 14 13:55:56 2020        DEPLOYED        mariadb-galera-11.0.0                    onap
 
 Here the Name column shows the RELEASE NAME, In our case we want to try the
 scale operation on cassandra, thus the RELEASE NAME would be dev-cassandra.
@@ -580,10 +580,10 @@ Below is the example for the same::
 
   > helm search cassandra
     NAME                    CHART VERSION   APP VERSION     DESCRIPTION
-    local/cassandra         10.0.0                          ONAP cassandra
-    local/portal-cassandra  10.0.0                          Portal cassandra
-    local/aaf-cass          10.0.0                          ONAP AAF cassandra
-    local/sdc-cs            10.0.0                          ONAP Service Design and Creation Cassandra
+    local/cassandra         11.0.0                          ONAP cassandra
+    local/portal-cassandra  11.0.0                          Portal cassandra
+    local/aaf-cass          11.0.0                          ONAP AAF cassandra
+    local/sdc-cs            11.0.0                          ONAP Service Design and Creation Cassandra
 
 Here the Name column shows the chart name. As we want to try the scale
 operation for cassandra, thus the corresponding chart name is local/cassandra
@@ -645,7 +645,7 @@ Prior to doing an upgrade, determine of the status of the deployed charts::
 
   > helm list
   NAME REVISION UPDATED                  STATUS    CHART     NAMESPACE
-  so   1        Mon Feb 5 10:05:22 2020  DEPLOYED  so-10.0.0 onap
+  so   1        Mon Feb 5 10:05:22 2020  DEPLOYED  so-11.0.0 onap
 
 When upgrading a cluster a parameter controls the minimum size of the cluster
 during the upgrade while another parameter controls the maximum number of nodes
@@ -668,21 +668,21 @@ sequence of events described in the previous paragraph would be initiated.
 For example, to upgrade a container by changing configuration, specifically an
 environment value::
 
-  > helm upgrade so onap/so --version 8.0.1 --set enableDebug=true
+  > helm upgrade so onap/so --version 11.0.1 --set enableDebug=true
 
 Issuing this command will result in the appropriate container being stopped by
 Kubernetes and replaced with a new container with the new environment value.
 
 To upgrade a component to a new version with a new configuration file enter::
 
-  > helm upgrade so onap/so --version 8.0.1 -f environments/demo.yaml
+  > helm upgrade so onap/so --version 11.0.1 -f environments/demo.yaml
 
 To fetch release history enter::
 
   > helm history so
   REVISION UPDATED                  STATUS     CHART     DESCRIPTION
-  1        Mon Feb 5 10:05:22 2020  SUPERSEDED so-9.0.0  Install complete
-  2        Mon Feb 5 10:10:55 2020  DEPLOYED   so-10.0.0 Upgrade complete
+  1        Mon Jul 5 10:05:22 2022  SUPERSEDED so-11.0.0 Install complete
+  2        Mon Jul 5 10:10:55 2022  DEPLOYED   so-11.0.1 Upgrade complete
 
 Unfortunately, not all upgrades are successful.  In recognition of this the
 lineup of pods within an ONAP deployment is tagged such that an administrator
@@ -704,9 +704,9 @@ For example, to roll-back back to previous system revision enter::
 
   > helm history so
   REVISION UPDATED                  STATUS     CHART     DESCRIPTION
-  1        Mon Feb 5 10:05:22 2020  SUPERSEDED so-9.0.0  Install complete
-  2        Mon Feb 5 10:10:55 2020  SUPERSEDED so-10.0.0 Upgrade complete
-  3        Mon Feb 5 10:14:32 2020  DEPLOYED   so-9.0.0  Rollback to 1
+  1        Mon Jul 5 10:05:22 2022  SUPERSEDED so-11.0.0 Install complete
+  2        Mon Jul 5 10:10:55 2022  SUPERSEDED so-11.0.1 Upgrade complete
+  3        Mon Jul 5 10:14:32 2022  DEPLOYED   so-11.0.0 Rollback to 1
 
 .. note::