projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for Bug 1626: Build failed due to upstream dependency not found
[osm/devops.git]
/
installers
/
charm
/
mysqld-exporter
/
src
/
charm.py
diff --git
a/installers/charm/mysqld-exporter/src/charm.py
b/installers/charm/mysqld-exporter/src/charm.py
index
85a1e67
..
bcd43b5
100755
(executable)
--- a/
installers/charm/mysqld-exporter/src/charm.py
+++ b/
installers/charm/mysqld-exporter/src/charm.py
@@
-49,6
+49,7
@@
PORT = 9104
class ConfigModel(ModelValidator):
site_url: Optional[str]
cluster_issuer: Optional[str]
class ConfigModel(ModelValidator):
site_url: Optional[str]
cluster_issuer: Optional[str]
+ ingress_class: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
mysql_uri: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
mysql_uri: Optional[str]
@@
-210,7
+211,9
@@
class MysqlExporterCharm(CharmedOsmBase):
# Add ingress resources to PodSpec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
# Add ingress resources to PodSpec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
- annotations = {"kubernetes.io/ingress.class": "public"}
+ annotations = {}
+ 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
)