projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1706 - Adding non-root user to run MON
[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
bf6fbd9
..
28be79a
100755
(executable)
--- a/
installers/charm/grafana/src/charm.py
+++ b/
installers/charm/grafana/src/charm.py
@@
-51,6
+51,7
@@
class ConfigModel(ModelValidator):
osm_dashboards: bool
site_url: Optional[str]
cluster_issuer: Optional[str]
osm_dashboards: bool
site_url: Optional[str]
cluster_issuer: Optional[str]
+ ingress_class: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
@@
-174,8
+175,10
@@
class GrafanaCharm(CharmedOsmBase):
str(config.max_file_size) + "m"
if config.max_file_size > 0
else config.max_file_size
str(config.max_file_size) + "m"
if config.max_file_size > 0
else config.max_file_size
- )
,
+ )
}
}
+ if config.ingress_class:
+ annotations["kubernetes.io/ingress.class"] = config.ingress_class
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
)
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
)