summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aaf')
-rw-r--r--kubernetes/aaf/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-cass/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-cass/requirements.yaml6
-rw-r--r--kubernetes/aaf/components/aaf-cm/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-cm/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-fs/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-fs/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-gui/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-gui/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-hello/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-hello/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-locate/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-locate/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-oauth/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-oauth/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-service/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-service/requirements.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-sms/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml6
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml6
-rw-r--r--kubernetes/aaf/components/aaf-sms/requirements.yaml12
-rw-r--r--kubernetes/aaf/components/aaf-sms/resources/config/osdf.json7
-rw-r--r--kubernetes/aaf/components/aaf-sms/templates/job.yaml6
-rw-r--r--kubernetes/aaf/components/aaf-sms/values.yaml10
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/requirements.yaml11
-rw-r--r--kubernetes/aaf/components/aaf-templates/Chart.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-templates/requirements.yaml4
-rw-r--r--kubernetes/aaf/requirements.yaml22
37 files changed, 128 insertions, 86 deletions
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 25d921e413..0a4168b7da 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 ZTE
# Modifications Copyright © 2018 AT&T, 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.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework
name: aaf
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index a3be84f3b0..ab6858ce8e 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF cassandra
name: aaf-cass
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
index e89dc58027..ac7f3c6875 100644
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index f5fd4ea6ba..8d0566eed9 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T, ZTE
+# 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.
@@ -16,4 +17,4 @@
apiVersion: v1
description: ONAP AAF Certificate Manager
name: aaf-cm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 5715c2372d..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
index fc1f072fd8..28c05e71b1 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF File Server
name: aaf-fs
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
index 5715c2372d..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
index cea56343d1..81a51e686c 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF GUI
name: aaf-gui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
index 4e6c3e6bbc..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
index 66bf3c088f..872491428b 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Hello
name: aaf-hello
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index 4e6c3e6bbc..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
index ef8928cf89..947284df14 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Locate
name: aaf-locate
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
index 4e6c3e6bbc..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
index 4b93d5ff3e..3c48c63cbf 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF OAuth
name: aaf-oauth
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
index 4e6c3e6bbc..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
index a533f56e81..33df46f21e 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -1,4 +1,5 @@
# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP AAF Service
name: aaf-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
index 4e6c3e6bbc..5086cc977c 100644
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,11 +14,11 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-templates
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
index df5240fb27..3e315fbd40 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Secret Management Service
name: aaf-sms
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index 5eef2736ac..2b879571ad 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Secret Management Service Quorum Client
name: aaf-sms-quorumclient
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
index e89dc58027..ac7f3c6875 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index 77e6d124bd..b05165e4da 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -16,4 +17,4 @@ apiVersion: v1
description: Chart to launch Vault as SMS backend
name: aaf-sms-vault
appVersion: 0.9.5
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
index e89dc58027..ac7f3c6875 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,8 +14,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
index 1876fda996..0cbd2a2edd 100644
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# 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.
@@ -14,17 +14,17 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: certInitializer
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-sms-quorumclient
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms-quorumclient'
- name: aaf-sms-vault
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
index add0808701..3ede31dc44 100644
--- a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
+++ b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
@@ -99,6 +99,13 @@
"UserName": "${OSDF_OPT_ENGINE_USER}",
"Password": "${OSDF_OPT_ENGINE_PASS}"
}
+ },
+ {
+ "name": "cps",
+ "values": {
+ "UserName": "${CPS_USER}",
+ "Password": "${CPS_PASS}"
+ }
}
]
}
diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
index 6e50620a99..6d9ecaa7cb 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -52,6 +52,7 @@ spec:
export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
export SO_PASS=${SO_PASS_PLAIN};
export SDC_PASS=${SDC_PASS_PLAIN};
+ export CPS_PASS=${CPS_PASS_PLAIN};
cd /config-input;
for PFILE in `find . -not -type d | grep -v -F ..`; do
envsubst <${PFILE} >/config/${PFILE};
@@ -137,6 +138,11 @@ spec:
- name: SDC_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "password") | indent 10 }}
+ - name: CPS_USER
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "login") | indent 10 }}
+ - name: CPS_PASS_PLAIN
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "password") | indent 10 }}
+
volumeMounts:
- mountPath: /config-input
name: {{ include "common.name" . }}-preload-input
diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index ab7d8fb71b..cde8529cc1 100644
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -197,6 +197,12 @@ secrets:
login: '{{ .Values.oofCreds.sdcUsername }}'
password: '{{ .Values.oofCreds.sdcPassword }}'
passwordPolicy: required
+ - uid: cps-creds
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.oofCreds.cpsUserExternalSecret) . }}'
+ login: '{{ .Values.oofCreds.cpsUsername }}'
+ password: '{{ .Values.oofCreds.cpsPassword }}'
+ passwordPolicy: required
oofCreds:
aaiUsername: oof@oof.onap.org
aaiPassword: demo123456!
@@ -246,6 +252,10 @@ oofCreds:
sdcUsername: aai
sdcPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ cpsUsername: ''
+ cpsPassword: ''
+ cpsUserExternalSecret: '{{ include "common.release" . }}-cps-core-app-user-creds'
+
# Configure resource requests and limits
resources:
small:
diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
index 157262bb7b..9bf0e7b47c 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Hardware Security Components
name: aaf-sshsm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index 63217a2b0c..4908c68780 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Resource Manager
name: aaf-sshsm-abrmd
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
index 594b12dc91..96c6cddeb8 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index 311130e5a9..d237c7b92f 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Distribution Center
name: aaf-sshsm-distcenter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
index 594b12dc91..96c6cddeb8 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index a50d95f042..baa354e490 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -15,4 +16,4 @@
apiVersion: v1
description: ONAP Trusted Platform Module Test CA Service
name: aaf-sshsm-testca
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
index 594b12dc91..96c6cddeb8 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -14,8 +15,8 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
index 134666def5..e39cac8f0f 100644
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# 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.
@@ -14,20 +15,20 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
- name: aaf-sshsm-abrmd
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-abrmd'
condition: aaf-sshsm-abrmd.enabled
- name: aaf-sshsm-distcenter
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-distcenter'
condition: aaf-sshsm-distcenter.enabled
- name: aaf-sshsm-testca
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm-testca'
condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index f87e6b8d60..708def6e19 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -1,5 +1,4 @@
-# Copyright © 2020 Orange
-# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
+# 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.
@@ -16,4 +15,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework Templates
name: aaf-templates
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index cead0783a4..392fda15b4 100644
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# 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.
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~8.x-0
+ version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index e5dd29adc4..2bf9b2862e 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -1,6 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
# Modifications Copyright © 2020 Nokia
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,42 +17,42 @@
dependencies:
- name: aaf-cass
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-cass'
condition: aaf-authz.enabled
- name: aaf-cm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-cm'
condition: aaf-authz.enabled
- name: aaf-fs
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-fs'
condition: aaf-authz.enabled
- name: aaf-gui
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-gui'
condition: aaf-authz.enabled
- name: aaf-hello
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-hello'
condition: aaf-hello.enabled
- name: aaf-locate
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-locate'
condition: aaf-authz.enabled
- name: aaf-oauth
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-oauth'
condition: aaf-authz.enabled
- name: aaf-service
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-service'
condition: aaf-authz.enabled
- name: aaf-sms
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sms'
condition: aaf-sms.enabled
- name: aaf-sshsm
- version: ~8.x-0
+ version: ~9.x-0
repository: 'file://components/aaf-sshsm'
condition: aaf-sshsm.enabled