X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fgrafana%2Fsrc%2Fcharm.py;h=a7cc036dfa0b2e39e528cc14116209cafb0f5763;hb=da31d6e2625a67c6180080ec9433d0f8ebe1de64;hp=d10ccf23335081c0da81b167a37b0ae1422c5cf1;hpb=c753dc5f89180d11c1049f6398d74a4f99d7acd5;p=osm%2Fdevops.git diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py index d10ccf23..a7cc036d 100755 --- a/installers/charm/grafana/src/charm.py +++ b/installers/charm/grafana/src/charm.py @@ -50,6 +50,7 @@ class ConfigModel(ModelValidator): max_file_size: int osm_dashboards: bool site_url: Optional[str] + cluster_issuer: Optional[str] ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] @@ -174,6 +175,7 @@ class GrafanaCharm(CharmedOsmBase): if config.max_file_size > 0 else config.max_file_size ), + "kubernetes.io/ingress.class": "public", } ingress_resource_builder = IngressResourceV3Builder( f"{self.app.name}-ingress", annotations @@ -184,6 +186,9 @@ class GrafanaCharm(CharmedOsmBase): "nginx.ingress.kubernetes.io/whitelist-source-range" ] = config.ingress_whitelist_source_range + if config.cluster_issuer: + annotations["cert-manager.io/cluster-issuer"] = config.cluster_issuer + if parsed.scheme == "https": ingress_resource_builder.add_tls( [parsed.hostname], config.tls_secret_name