Fix bug 1547: Add ingress.class annotation to OSM charms
Change-Id: I436a536929ec5f511721a77a55ee4bb55892d057
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py
index bf6fbd9..a7cc036 100755
--- a/installers/charm/grafana/src/charm.py
+++ b/installers/charm/grafana/src/charm.py
@@ -175,6 +175,7 @@
if config.max_file_size > 0
else config.max_file_size
),
+ "kubernetes.io/ingress.class": "public",
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
diff --git a/installers/charm/kafka-exporter/src/charm.py b/installers/charm/kafka-exporter/src/charm.py
index 123fa0b..3b599a8 100755
--- a/installers/charm/kafka-exporter/src/charm.py
+++ b/installers/charm/kafka-exporter/src/charm.py
@@ -194,7 +194,7 @@
# Add ingress resources to PodSpec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
- annotations = {}
+ annotations = {"kubernetes.io/ingress.class": "public"}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
)
diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py
index b5ce0cc..6693080 100755
--- a/installers/charm/keystone/src/charm.py
+++ b/installers/charm/keystone/src/charm.py
@@ -365,6 +365,7 @@
if config.max_file_size > 0
else config.max_file_size
),
+ "kubernetes.io/ingress.class": "public",
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
diff --git a/installers/charm/mongodb-exporter/src/charm.py b/installers/charm/mongodb-exporter/src/charm.py
index fd318fa..a2b9471 100755
--- a/installers/charm/mongodb-exporter/src/charm.py
+++ b/installers/charm/mongodb-exporter/src/charm.py
@@ -214,7 +214,7 @@
# Add ingress resources to PodSpec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
- annotations = {}
+ annotations = {"kubernetes.io/ingress.class": "public"}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
)
diff --git a/installers/charm/mysqld-exporter/src/charm.py b/installers/charm/mysqld-exporter/src/charm.py
index 2ae7d83..85a1e67 100755
--- a/installers/charm/mysqld-exporter/src/charm.py
+++ b/installers/charm/mysqld-exporter/src/charm.py
@@ -210,7 +210,7 @@
# Add ingress resources to PodSpec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
- annotations = {}
+ annotations = {"kubernetes.io/ingress.class": "public"}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
)
diff --git a/installers/charm/nbi/src/charm.py b/installers/charm/nbi/src/charm.py
index bbbf5ec..0af4104 100755
--- a/installers/charm/nbi/src/charm.py
+++ b/installers/charm/nbi/src/charm.py
@@ -249,6 +249,7 @@
else config.max_file_size
),
"nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
+ "kubernetes.io/ingress.class": "public",
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
diff --git a/installers/charm/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py
index 5efaaae..1c53163 100755
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@ -149,6 +149,7 @@
if config.max_file_size > 0
else config.max_file_size
),
+ "kubernetes.io/ingress.class": "public",
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations
diff --git a/installers/charm/prometheus/src/charm.py b/installers/charm/prometheus/src/charm.py
index 5fdee72..cf4f956 100755
--- a/installers/charm/prometheus/src/charm.py
+++ b/installers/charm/prometheus/src/charm.py
@@ -197,6 +197,7 @@
if config.max_file_size > 0
else config.max_file_size
),
+ "kubernetes.io/ingress.class": "public",
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations