4 files changed, 185 insertions, 191 deletions
diff --git a/kubernetes/onap/.helmignore b/kubernetes/onap/.helmignore
new file mode 100644
index 0000000000..7ddbad7ef4
--- /dev/null
+++ b/kubernetes/onap/.helmignore
@@ -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
+components/
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index d9525c5750..4754f9fd2f 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 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.
@@ -12,13 +13,169 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
+apiVersion: v2
 name: onap
-version: 9.0.0
-appVersion: Istanbul
+version: 10.0.0
+appVersion: Jakarta
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
 icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
-kubeVersion: ">=1.19.0-0"
+kubeVersion: ">=1.19.11-0"
+
+dependencies:
+  - name: aaf
+    version: ~10.x-0
+    repository: '@local'
+    condition: aaf.enabled
+  - name: aai
+    version: ~10.x-0
+    repository: '@local'
+    condition: aai.enabled
+  - name: appc
+    version: ~10.x-0
+    repository: '@local'
+    condition: appc.enabled
+  - name: cassandra
+    version: ~10.x-0
+    repository: '@local'
+    condition: cassandra.enabled
+  - name: cds
+    version: ~10.x-0
+    repository: '@local'
+    condition: cds.enabled
+  - name: cli
+    version: ~10.x-0
+    repository: '@local'
+    condition: cli.enabled
+  - name: common
+    version: ~10.x-0
+    repository: '@local'
+  - name: consul
+    version: ~10.x-0
+    repository: '@local'
+    condition: consul.enabled
+  - name: contrib
+    version: ~10.x-0
+    repository: '@local'
+    condition: global.addTestingComponents
+  - name: cps
+    version: ~10.x-0
+    repository: '@local'
+    condition: cps.enabled
+  - name: dcaegen2
+    version: ~10.x-0
+    repository: '@local'
+    condition: dcaegen2.enabled
+  - name: dcaegen2-services
+    version: ~10.x-0
+    repository: '@local'
+    condition: dcaegen2-services.enabled
+  - name: dcaemod
+    version: ~10.x-0
+    repository: '@local'
+    condition: dcaemod.enabled
+  - name: holmes
+    version: ~10.x-0
+    repository: '@local'
+    condition: holmes.enabled
+  - name: dmaap
+    version: ~10.x-0
+    repository: '@local'
+    condition: dmaap.enabled
+  - name: log
+    version: ~10.x-0
+    repository: '@local'
+    condition: log.enabled
+  - name: sniro-emulator
+    version: ~10.x-0
+    repository: '@local'
+    condition: sniro-emulator.enabled
+  - name: mariadb-galera
+    version: ~10.x-0
+    repository: '@local'
+    condition: mariadb-galera.enabled
+  - name: msb
+    version: ~10.x-0
+    repository: '@local'
+    condition: msb.enabled
+  - name: multicloud
+    version: ~10.x-0
+    repository: '@local'
+    condition: multicloud.enabled
+  - name: nbi
+    version: ~10.x-0
+    repository: '@local'
+    condition: nbi.enabled
+  - name: policy
+    version: ~10.x-0
+    repository: '@local'
+    condition: policy.enabled
+  - name: portal
+    version: ~10.x-0
+    repository: '@local'
+    condition: portal.enabled
+  - name: postgres
+    version: ~10.x-0
+    repository: '@local'
+    condition: postgres.enabled
+  - name: oof
+    version: ~10.x-0
+    repository: '@local'
+    condition: oof.enabled
+  - name: repository-wrapper
+    version: ~10.x-0
+    repository: '@local'
+  - name: robot
+    version: ~10.x-0
+    repository: '@local'
+    condition: robot.enabled
+  - name: sdc
+    version: ~10.x-0
+    repository: '@local'
+    condition: sdc.enabled
+  - name: sdnc
+    version: ~10.x-0
+    repository: '@local'
+    condition: sdnc.enabled
+  - name: so
+    version: ~10.x-0
+    repository: '@local'
+    condition: so.enabled
+  - name: uui
+    version: ~10.x-0
+    repository: '@local'
+    condition: uui.enabled
+  - name: vfc
+    version: ~10.x-0
+    repository: '@local'
+    condition: vfc.enabled
+  - name: vid
+    version: ~10.x-0
+    repository: '@local'
+    condition: vid.enabled
+  - name: vnfsdk
+    version: ~10.x-0
+    repository: '@local'
+    condition: vnfsdk.enabled
+  - name: modeling
+    version: ~10.x-0
+    repository: '@local'
+    condition: modeling.enabled
+  - name: platform
+    version: ~10.x-0
+    repository: '@local'
+    condition: platform.enabled
+  - name: a1policymanagement
+    version: ~10.x-0
+    repository: '@local'
+    condition: a1policymanagement.enabled
+  - name: cert-wrapper
+    version: ~10.x-0
+    repository: '@local'
+    condition: cert-wrapper.enabled
+  - name: roles-wrapper
+    version: ~10.x-0
+    repository: '@local'
+    condition: roles-wrapper.enabled
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
deleted file mode 100755
index 694546f23f..0000000000
--- a/kubernetes/onap/requirements.yaml
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright © 2019 Amdocs, Bell Canada
-# Copyright (c) 2020 Nordix Foundation, Modifications
-# Modifications Copyright © 2020 Nokia
-# Modifications Copyright © 2020-2021 Orange
-#
-# 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.
-
-# Referencing a named repo called 'local'.
-# Can add this repo by running commands like:
-# > helm serve
-# > helm repo add local http://127.0.0.1:8879
-dependencies:
-  - name: aaf
-    version: ~9.x-0
-    repository: '@local'
-    condition: aaf.enabled
-  - name: aai
-    version: ~9.x-0
-    repository: '@local'
-    condition: aai.enabled
-  - name: appc
-    version: ~9.x-0
-    repository: '@local'
-    condition: appc.enabled
-  - name: cassandra
-    version: ~9.x-0
-    repository: '@local'
-    condition: cassandra.enabled
-  - name: cds
-    version: ~9.x-0
-    repository: '@local'
-    condition: cds.enabled
-  - name: cli
-    version: ~9.x-0
-    repository: '@local'
-    condition: cli.enabled
-  - name: common
-    version: ~9.x-0
-    repository: '@local'
-  - name: consul
-    version: ~9.x-0
-    repository: '@local'
-    condition: consul.enabled
-  - name: contrib
-    version: ~9.x-0
-    repository: '@local'
-    condition: global.addTestingComponents
-  - name: cps
-    version: ~9.x-0
-    repository: '@local'
-    condition: cps.enabled
-  - name: dcaegen2
-    version: ~9.x-0
-    repository: '@local'
-    condition: dcaegen2.enabled
-  - name: dcaegen2-services
-    version: ~9.x-0
-    repository: '@local'
-    condition: dcaegen2-services.enabled
-  - name: dcaemod
-    version: ~9.x-0
-    repository: '@local'
-    condition: dcaemod.enabled
-  - name: holmes
-    version: ~9.x-0
-    repository: '@local'
-    condition: holmes.enabled
-  - name: dmaap
-    version: ~9.x-0
-    repository: '@local'
-    condition: dmaap.enabled
-  - name: log
-    version: ~9.x-0
-    repository: '@local'
-    condition: log.enabled
-  - name: sniro-emulator
-    version: ~9.x-0
-    repository: '@local'
-    condition: sniro-emulator.enabled
-  - name: mariadb-galera
-    version: ~9.x-0
-    repository: '@local'
-    condition: mariadb-galera.enabled
-  - name: msb
-    version: ~9.x-0
-    repository: '@local'
-    condition: msb.enabled
-  - name: multicloud
-    version: ~9.x-0
-    repository: '@local'
-    condition: multicloud.enabled
-  - name: nbi
-    version: ~9.x-0
-    repository: '@local'
-    condition: nbi.enabled
-  - name: policy
-    version: ~9.x-0
-    repository: '@local'
-    condition: policy.enabled
-  - name: portal
-    version: ~9.x-0
-    repository: '@local'
-    condition: portal.enabled
-  - name: postgres
-    version: ~9.x-0
-    repository: '@local'
-    condition: postgres.enabled
-  - name: oof
-    version: ~9.x-0
-    repository: '@local'
-    condition: oof.enabled
-  - name: repository-wrapper
-    version: ~9.x-0
-    repository: '@local'
-  - name: robot
-    version: ~9.x-0
-    repository: '@local'
-    condition: robot.enabled
-  - name: sdc
-    version: ~9.x-0
-    repository: '@local'
-    condition: sdc.enabled
-  - name: sdnc
-    version: ~9.x-0
-    repository: '@local'
-    condition: sdnc.enabled
-  - name: so
-    version: ~9.x-0
-    repository: '@local'
-    condition: so.enabled
-  - name: uui
-    version: ~9.x-0
-    repository: '@local'
-    condition: uui.enabled
-  - name: vfc
-    version: ~9.x-0
-    repository: '@local'
-    condition: vfc.enabled
-  - name: vid
-    version: ~9.x-0
-    repository: '@local'
-    condition: vid.enabled
-  - name: vnfsdk
-    version: ~9.x-0
-    repository: '@local'
-    condition: vnfsdk.enabled
-  - name: modeling
-    version: ~9.x-0
-    repository: '@local'
-    condition: modeling.enabled
-  - name: platform
-    version: ~9.x-0
-    repository: '@local'
-    condition: platform.enabled
-  - name: a1policymanagement
-    version: ~9.x-0
-    repository: '@local'
-    condition: a1policymanagement.enabled
-  - name: cert-wrapper
-    version: ~9.x-0
-    repository: '@local'
-    condition: cert-wrapper.enabled
-  - name: roles-wrapper
-    version: ~9.x-0
-    repository: '@local'
-    condition: roles-wrapper.enabled
-  - name: timescaledb
-    version: ~9.x-0
-    repository: '@local'
-    condition: timescaledb.enabled
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 278a2da156..50703fbf4a 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -82,10 +82,10 @@ appc:
       periodSeconds: 60
 cassandra:
   liveness:
-    initialDelaySeconds: 120
+    timeoutSeconds: 30
     periodSeconds: 120
   readiness:
-    initialDelaySeconds: 120
+    timeoutSeconds: 30
     periodSeconds: 60
 clamp:
   liveness:
@@ -120,11 +120,6 @@ dmaap:
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
-  message-router:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
   dmaap-dr-prov:
     liveness:
       initialDelaySeconds: 120