projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10884: Juju 2.9 support
[osm/devops.git]
/
installers
/
charm
/
keystone
/
src
/
charm.py
diff --git
a/installers/charm/keystone/src/charm.py
b/installers/charm/keystone/src/charm.py
index
8300b88
..
1dd0ba5
100755
(executable)
--- a/
installers/charm/keystone/src/charm.py
+++ b/
installers/charm/keystone/src/charm.py
@@
-78,6
+78,7
@@
class ConfigModel(ModelValidator):
token_expiration: int
max_file_size: int
site_url: Optional[str]
token_expiration: int
max_file_size: int
site_url: Optional[str]
+ ingress_class: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
mysql_host: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
mysql_host: Optional[str]
@@
-369,9
+370,10
@@
class KeystoneCharm(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
- ),
- "kubernetes.io/ingress.class": "public",
+ )
}
}
+ 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
)