Feature 10884: Juju 2.9 support
- Update osm bundles (charmed)
- Update Juju version (snap and agent version) (charmed and k8s)
- Update to new mongodb charm (charmed and k8s)
- Fix ingress issue by adding an ingress_class config
- Charmed installer: point to local bundles until all charms are in
CharmHub
Change-Id: I6ff8328e5db6719bbf9d5d4c9b5490f478b2ace8
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/keystone/config.yaml b/installers/charm/keystone/config.yaml
index 402096c..9a7acd5 100644
--- a/installers/charm/keystone/config.yaml
+++ b/installers/charm/keystone/config.yaml
@@ -20,6 +20,11 @@
If there is a reverse proxy in front of Keystone, it may
need to be configured to handle the requested size.
default: 5
+ ingress_class:
+ type: string
+ description: |
+ Ingress class name. This is useful for selecting the ingress to be used
+ in case there are multiple ingresses in the underlying k8s clusters.
ingress_whitelist_source_range:
type: string
description: |
diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py
index 8300b88..1dd0ba5 100755
--- a/installers/charm/keystone/src/charm.py
+++ b/installers/charm/keystone/src/charm.py
@@ -78,6 +78,7 @@
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]
@@ -369,9 +370,10 @@
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
)