From: sousaedu Date: Fri, 30 Jul 2021 12:40:47 +0000 (+0200) Subject: Fix bug 1620 - adding option to LCM charm to configure Helm CA certificates X-Git-Tag: release-v11.0-start~40 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=8686601c00337e33edb3f74d79d61c68d61d135f Fix bug 1620 - adding option to LCM charm to configure Helm CA certificates Change-Id: I90f2f9ab1379deb45240a2d94e123cbbcd4ecf42 Signed-off-by: sousaedu --- diff --git a/installers/charm/lcm/config.yaml b/installers/charm/lcm/config.yaml index 78efe2f3..dcebce87 100644 --- a/installers/charm/lcm/config.yaml +++ b/installers/charm/lcm/config.yaml @@ -270,3 +270,7 @@ options: description: Stable repository URL for Helm charts type: string default: https://charts.helm.sh/stable + vca_helm_ca_certs: + description: CA certificates to validate access to Helm repository + type: string + default: "" diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py index 9b025c92..fecd1b3c 100755 --- a/installers/charm/lcm/src/charm.py +++ b/installers/charm/lcm/src/charm.py @@ -109,6 +109,7 @@ class ConfigModel(ModelValidator): vca_model_config_transmit_vendor_metrics: Optional[bool] vca_model_config_update_status_hook_interval: Optional[str] vca_stablerepourl: Optional[str] + vca_helm_ca_certs: Optional[str] @validator("log_level") def validate_log_level(cls, v): @@ -193,6 +194,7 @@ class LcmCharm(CharmedOsmBase): "OSMLCM_STORAGE_URI": config.mongodb_uri or self.mongodb_client.connection_string, "OSMLCM_VCA_STABLEREPOURL": config.vca_stablerepourl, + "OSMLCM_VCA_HELM_CA_CERTS": config.vca_helm_ca_certs, } ) if config.vca_host: