summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/components/aaf-sms
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aaf/components/aaf-sms')
-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
9 files changed, 41 insertions, 15 deletions
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: