X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fmysqld-exporter%2Fsrc%2Fpod_spec.py;h=8068be7fc107ef7b4eb14ddf7c2665a282cb325b;hb=HEAD;hp=ec84221850133f0316ffc2604e2a8b71f323c6ff;hpb=90d10f5dc85d577c7cec2d608b19a23120df1281;p=osm%2Fdevops.git diff --git a/installers/charm/mysqld-exporter/src/pod_spec.py b/installers/charm/mysqld-exporter/src/pod_spec.py index ec842218..8068be7f 100644 --- a/installers/charm/mysqld-exporter/src/pod_spec.py +++ b/installers/charm/mysqld-exporter/src/pod_spec.py @@ -20,8 +20,8 @@ # osm-charmers@lists.launchpad.net ## -import logging from ipaddress import ip_network +import logging from typing import Any, Dict, List from urllib.parse import urlparse @@ -62,6 +62,9 @@ def _validate_data(config_data: Dict[str, Any], relation_data: Dict[str, Any]) - "site_url": lambda value, _: isinstance(value, str) if value is not None else True, + "cluster_issuer": lambda value, _: isinstance(value, str) + if value is not None + else True, "ingress_whitelist_source_range": lambda value, _: _validate_ip_network(value), "tls_secret_name": lambda value, _: isinstance(value, str) if value is not None @@ -152,6 +155,7 @@ def _make_pod_ingress_resources( return ingress_whitelist_source_range = config["ingress_whitelist_source_range"] + cluster_issuer = config["cluster_issuer"] annotations = {} @@ -160,6 +164,9 @@ def _make_pod_ingress_resources( "nginx.ingress.kubernetes.io/whitelist-source-range" ] = ingress_whitelist_source_range + if cluster_issuer: + annotations["cert-manager.io/cluster-issuer"] = cluster_issuer + ingress_spec_tls = None if parsed.scheme == "https":