projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1539: Helm v2.17.0 and set default value for stablerepourl
[osm/devops.git]
/
installers
/
charm
/
grafana
/
src
/
charm.py
diff --git
a/installers/charm/grafana/src/charm.py
b/installers/charm/grafana/src/charm.py
index
d10ccf2
..
bf6fbd9
100755
(executable)
--- 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]
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]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
@@
-184,6
+185,9
@@
class GrafanaCharm(CharmedOsmBase):
"nginx.ingress.kubernetes.io/whitelist-source-range"
] = config.ingress_whitelist_source_range
"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
if parsed.scheme == "https":
ingress_resource_builder.add_tls(
[parsed.hostname], config.tls_secret_name