3 files changed, 16 insertions, 29 deletions
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index ea00e39c27..f2f7ffa6a2 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 # Modifications Copyright © 2021 Orange
+# 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.
@@ -14,7 +15,18 @@
 # limitations under the License.
 
 
-apiVersion: v1
+apiVersion: v2
 description: ONAP cassandra
 name: cassandra
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+  - name: common
+    version: ~10.x-0
+    repository: 'file://../common'
+  - name: repositoryGenerator
+    version: ~10.x-0
+    repository: 'file://../repositoryGenerator'
+  - name: serviceAccount
+    version: ~10.x-0
+    repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
deleted file mode 100644
index 4189d43387..0000000000
--- a/kubernetes/common/cassandra/requirements.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 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.
-
-dependencies:
-  - name: common
-    version: ~9.x-0
-    repository: 'file://../common'
-  - name: repositoryGenerator
-    version: ~9.x-0
-    repository: 'file://../repositoryGenerator'
-  - name: serviceAccount
-    version: ~9.x-0
-    repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index 4dcebc8883..f9f62739f2 100644
--- a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@ -29,7 +29,8 @@ _ip_address() {
 
 # "sed -i", but without "mv" (which doesn't work on a bind-mounted file, for example)
 _sed_in_place() {
-        local filename="$1"; shift
+        local filename
+        filename="$1"; shift
         local tempFile
         tempFile="$(mktemp)"
         sed "$@" "$filename" > "$tempFile"