aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/uui
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2021-10-12 14:10:49 +0100
committerefiacor <fiachra.corcoran@est.tech>2021-12-07 12:36:35 +0000
commit370c6dc33e55bfee7b3b79bcc21481b02a3f1e24 (patch)
treef687912dcc35388a56a4fdacd9bddc81c667ff95 /kubernetes/uui
parent71a47c57fa84a36bb12bf3b87ad0d18b142c8d37 (diff)
[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
Diffstat (limited to 'kubernetes/uui')
-rw-r--r--kubernetes/uui/Chart.yaml25
-rw-r--r--kubernetes/uui/Makefile4
-rw-r--r--kubernetes/uui/components/Makefile4
-rw-r--r--kubernetes/uui/components/uui-nlp/Chart.yaml16
-rw-r--r--kubernetes/uui/components/uui-nlp/requirements.yaml27
-rw-r--r--kubernetes/uui/components/uui-server/Chart.yaml19
-rw-r--r--kubernetes/uui/components/uui-server/requirements.yaml27
-rw-r--r--kubernetes/uui/requirements.yaml35
8 files changed, 58 insertions, 99 deletions
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index cd82001154..dab69dd3e3 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 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,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP uui
name: uui
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: uui-server
+ version: ~10.x-0
+ repository: 'file://components/uui-server'
+ - name: uui-nlp
+ version: ~10.x-0
+ repository: 'file://components/uui-nlp'
diff --git a/kubernetes/uui/Makefile b/kubernetes/uui/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/uui/Makefile
+++ b/kubernetes/uui/Makefile
@@ -33,7 +33,7 @@ make-%:
@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 @@ package-%: lint-%
@$(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/uui/components/Makefile b/kubernetes/uui/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/uui/components/Makefile
+++ b/kubernetes/uui/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@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 @@ package-%: lint-%
@$(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/uui/components/uui-nlp/Chart.yaml b/kubernetes/uui/components/uui-nlp/Chart.yaml
index 3f09b486aa..d748aad543 100644
--- a/kubernetes/uui/components/uui-nlp/Chart.yaml
+++ b/kubernetes/uui/components/uui-nlp/Chart.yaml
@@ -2,6 +2,7 @@
# ================================================================================
# Copyright (c) 2021 AT&T. All rights reserved.
# 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.
@@ -16,7 +17,18 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-apiVersion: v1
+apiVersion: v2
description: ONAP UUI NLP
name: uui-nlp
-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' \ No newline at end of file
diff --git a/kubernetes/uui/components/uui-nlp/requirements.yaml b/kubernetes/uui/components/uui-nlp/requirements.yaml
deleted file mode 100644
index 52fd1da64e..0000000000
--- a/kubernetes/uui/components/uui-nlp/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-#============LICENSE_START========================================================
-# Copyright (c) 2021 AT&T. All rights reserved.
-# 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.
-# ============LICENSE_END=========================================================
-
-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/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index 493ff185be..d6cc6f0697 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 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,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP uui server
name: uui-server
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/uui/components/uui-server/requirements.yaml b/kubernetes/uui/components/uui-server/requirements.yaml
deleted file mode 100644
index 34cedc84cb..0000000000
--- a/kubernetes/uui/components/uui-server/requirements.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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
- # local reference to common chart, as it is
- # a part of this chart's package and will not
- # be published independently to a repo (at this point)
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
deleted file mode 100644
index d60dc43132..0000000000
--- a/kubernetes/uui/requirements.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2017 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
- # local reference to common chart, as it is
- # a part of this chart's package and will not
- # be published independently to a repo (at this point)
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: uui-server
- version: ~9.x-0
- repository: 'file://components/uui-server'
- - name: uui-nlp
- version: ~9.x-0
- repository: 'file://components/uui-nlp'
- condition: uui-nlp.enabled