X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fkafka-exporter%2Fsrc%2Fpod_spec.py;h=214d6529acf5b0c0d0b80cfa6b7827f768ae5eb0;hb=f88cb4f7140fd4e56b797deb29a41bd69c37913d;hp=a50d96f635eb005b7e4420a128907d84b519a1eb;hpb=6332d381ac94fcee447d24fa33c15997c21bbf79;p=osm%2Fdevops.git diff --git a/installers/charm/kafka-exporter/src/pod_spec.py b/installers/charm/kafka-exporter/src/pod_spec.py index a50d96f6..214d6529 100644 --- a/installers/charm/kafka-exporter/src/pod_spec.py +++ b/installers/charm/kafka-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 @@ -146,6 +149,7 @@ def _make_pod_ingress_resources( return ingress_whitelist_source_range = config["ingress_whitelist_source_range"] + cluster_issuer = config["cluster_issuer"] annotations = {} @@ -154,6 +158,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":