From 495e8f8283bd6dfb7b4d4f822b06291a7cf04205 Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Mon, 29 Mar 2021 11:50:57 +0200 Subject: Add configuration of external tls init container - CMPv2 - Add configuration of certificates exists in secret - Add configuration of secret contains passwords Issue-ID: OOM-2712 Signed-off-by: Tomasz Wrobel Change-Id: I4e0d6fb3717fdf19b5110a83d9273fd7bcf75757 --- k8s/tests/common.py | 15 +++++++++++---- k8s/tests/test_k8sclient_deploy.py | 9 +++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'k8s/tests') diff --git a/k8s/tests/common.py b/k8s/tests/common.py index 19d94d6..3bd2db1 100644 --- a/k8s/tests/common.py +++ b/k8s/tests/common.py @@ -105,15 +105,22 @@ def verify_external_cert(dep): "STATE": "California", "COUNTRY": "US", "SANS": "mysans", - "KEYSTORE_PATH": "/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks", - "KEYSTORE_PASSWORD": "secret1", - "TRUSTSTORE_PATH": "/etc/onap/oom/certservice/certs/truststore.jks", - "TRUSTSTORE_PASSWORD": "secret2"} + "KEYSTORE_PATH": "/etc/onap/oom/certservice/certs/keystore.jks", + "TRUSTSTORE_PATH": "/etc/onap/oom/certservice/certs/truststore.jks"} + envs = {k.name: k.value for k in cert_container.env} for k in expected_envs: assert (k in envs and expected_envs[k] == envs[k]) + envs_from_source = {k.name: k.value_from for k in cert_container.env} + expected_secret_key_ref = { + "KEYSTORE_PASSWORD": "oom-cert-service-client-tls-secret-password", + "TRUSTSTORE_PASSWORD": "oom-cert-service-client-tls-secret-password" + } + for key, value in expected_secret_key_ref.items(): + assert (key in envs_from_source and str(envs_from_source[key]).__contains__(value)) + def verify_cert_post_processor(dep): cert_container = dep.spec.template.spec.init_containers[2] diff --git a/k8s/tests/test_k8sclient_deploy.py b/k8s/tests/test_k8sclient_deploy.py index cd00f37..94957a6 100644 --- a/k8s/tests/test_k8sclient_deploy.py +++ b/k8s/tests/test_k8sclient_deploy.py @@ -50,8 +50,13 @@ K8S_CONFIGURATION = { "state": "California", "organizational_unit": "ONAP", "location": "San-Francisco", - "keystore_password": "secret1", - "truststore_password": "secret2" + "cert_secret_name": "oom-cert-service-client-tls-secret", + "keystore_secret_key" : "keystore.jks", + "truststore_secret_key" : "truststore.jks", + "keystore_password_secret_name": "oom-cert-service-client-tls-secret-password", + "truststore_password_secret_name": "oom-cert-service-client-tls-secret-password", + "keystore_password_secret_key" : "password", + "truststore_password_secret_key" : "password" }, "cert_post_processor": { "image_tag": "repo/oom-cert-post-processor:2.1.0" -- cgit 1.2.3-korg