[GLOBAL] Migrate to helm v3
Move all Chart.yaml to use apiVersion: 2
Move dependencies from requirements.yaml to Chart.yaml
Changes to all makeFiles
Changes to helm deploy plugin
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I03c5290eee9e40f76eacbf171e774204cf5fb1c0
Issue-ID: OOM-2845
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 2df075a..1b5552a 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Bell Canada
# 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.
@@ -13,7 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP optional tools
name: contrib
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: awx
+ version: ~10.x-0
+ repository: 'file://components/awx'
+ condition: awx.enabled
+ - name: ejbca
+ version: ~10.x-0
+ repository: 'file://components/ejbca'
+ condition: global.cmpv2Enabled
+ - name: netbox
+ version: ~10.x-0
+ repository: 'file://components/netbox'
+ condition: netbox.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/Makefile b/kubernetes/contrib/Makefile
index 4d35146..81e43ac 100644
--- a/kubernetes/contrib/Makefile
+++ b/kubernetes/contrib/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/Makefile b/kubernetes/contrib/components/Makefile
index bf267b7..f4c9784 100644
--- a/kubernetes/contrib/components/Makefile
+++ b/kubernetes/contrib/components/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 6b7fb60..b29a3d7 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Bell Canada
# 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.
@@ -13,9 +14,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Ansible AWX
name: awx
sources:
- https://github.com/ansible/awx
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: awx-postgres
+ version: ~10.x-0
+ repository: 'file://components/awx-postgres'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index 4c79718..51d7de1 100644
--- a/kubernetes/contrib/components/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/components/Makefile b/kubernetes/contrib/components/awx/components/Makefile
index bf267b7..f4c9784 100644
--- a/kubernetes/contrib/components/awx/components/Makefile
+++ b/kubernetes/contrib/components/awx/components/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index 66bf12e..2999873 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2019 Bell Canada
# 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.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Ansible AWX database
name: awx-postgres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
deleted file mode 100755
index eae0750..0000000
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2019 Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
deleted file mode 100755
index 8e588f5..0000000
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2019 Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: awx-postgres
- version: ~9.x-0
- repository: 'file://components/awx-postgres'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 638c6db..2d68326 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2020 Nokia
# 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.
@@ -13,7 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP EJBCA test server
name: ejbca
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: cmpv2Config
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
deleted file mode 100644
index dabf474..0000000
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2020 Orange, Ericsson
-# 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: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- condition: not global.mariadbGalera.localCluster
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: cmpv2Config
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index a580269..24c9801 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# 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.
@@ -13,7 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox IPAM
name: netbox
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: netbox-app
+ version: ~10.x-0
+ repository: 'file://components/netbox-app'
+ - name: netbox-nginx
+ version: ~10.x-0
+ repository: 'file://components/netbox-nginx'
+ - name: netbox-postgres
+ version: ~10.x-0
+ repository: 'file://components/netbox-postgres'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile
index 4c79718..51d7de1 100644
--- a/kubernetes/contrib/components/netbox/Makefile
+++ b/kubernetes/contrib/components/netbox/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/netbox/components/Makefile b/kubernetes/contrib/components/netbox/components/Makefile
index bf267b7..f4c9784 100644
--- a/kubernetes/contrib/components/netbox/components/Makefile
+++ b/kubernetes/contrib/components/netbox/components/Makefile
@@ -33,7 +33,7 @@
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index d274160..19087d3 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# 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.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox - Application (WSGI + Gunicorn)
name: netbox-app
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
deleted file mode 100755
index 0bfe137..0000000
--- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index af54335..4e4fdc0 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# 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.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox - Nginx web server
name: netbox-nginx
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
deleted file mode 100755
index 0bfe137..0000000
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index 435c7e2..85654d9 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, Bell Canada
# 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.
@@ -13,7 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: Netbox Posgres database
name: netbox-postgres
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
deleted file mode 100755
index 0bfe137..0000000
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
deleted file mode 100755
index 467b6cf..0000000
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# 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: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: netbox-app
- version: ~9.x-0
- repository: 'file://components/netbox-app'
- - name: netbox-nginx
- version: ~9.x-0
- repository: 'file://components/netbox-nginx'
- - name: netbox-postgres
- version: ~9.x-0
- repository: 'file://components/netbox-postgres'
diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
index a618fd7..dede98e 100644
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/bind9dns/Chart.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-apiVersion: v1
+apiVersion: v2
appVersion: "1.0"
description: bind9 DNS server for kubernetes cluster
name: bind9dns
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
deleted file mode 100644
index c6d0a19..0000000
--- a/kubernetes/contrib/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada
-# 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: '@local'
- - name: awx
- version: ~9.x-0
- repository: 'file://components/awx'
- condition: awx.enabled
- - name: ejbca
- version: ~9.x-0
- repository: 'file://components/ejbca'
- condition: global.cmpv2Enabled
- - name: netbox
- version: ~9.x-0
- repository: 'file://components/netbox'
- condition: netbox.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'