From da31d6e2625a67c6180080ec9433d0f8ebe1de64 Mon Sep 17 00:00:00 2001
From: David Garcia <david.garcia@canonical.com>
Date: Thu, 27 May 2021 16:06:20 +0200
Subject: [PATCH] Fix bug 1547: Add ingress.class annotation to OSM charms

Change-Id: I436a536929ec5f511721a77a55ee4bb55892d057
Signed-off-by: David Garcia <david.garcia@canonical.com>
---
 installers/charm/grafana/src/charm.py          | 1 +
 installers/charm/kafka-exporter/src/charm.py   | 2 +-
 installers/charm/keystone/src/charm.py         | 1 +
 installers/charm/mongodb-exporter/src/charm.py | 2 +-
 installers/charm/mysqld-exporter/src/charm.py  | 2 +-
 installers/charm/nbi/src/charm.py              | 1 +
 installers/charm/ng-ui/src/charm.py            | 1 +
 installers/charm/prometheus/src/charm.py       | 1 +
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py
index bf6fbd9d..a7cc036d 100755
--- a/installers/charm/grafana/src/charm.py
+++ b/installers/charm/grafana/src/charm.py
@@ -175,6 +175,7 @@ class GrafanaCharm(CharmedOsmBase):
                     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 123fa0b2..3b599a85 100755
--- a/installers/charm/kafka-exporter/src/charm.py
+++ b/installers/charm/kafka-exporter/src/charm.py
@@ -194,7 +194,7 @@ class KafkaExporterCharm(CharmedOsmBase):
         # 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 b5ce0cc6..66930803 100755
--- a/installers/charm/keystone/src/charm.py
+++ b/installers/charm/keystone/src/charm.py
@@ -365,6 +365,7 @@ class KeystoneCharm(CharmedOsmBase):
                     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 fd318faf..a2b94719 100755
--- a/installers/charm/mongodb-exporter/src/charm.py
+++ b/installers/charm/mongodb-exporter/src/charm.py
@@ -214,7 +214,7 @@ class MongodbExporterCharm(CharmedOsmBase):
         # 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 2ae7d837..85a1e67a 100755
--- a/installers/charm/mysqld-exporter/src/charm.py
+++ b/installers/charm/mysqld-exporter/src/charm.py
@@ -210,7 +210,7 @@ class MysqlExporterCharm(CharmedOsmBase):
         # 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 bbbf5ece..0af41045 100755
--- a/installers/charm/nbi/src/charm.py
+++ b/installers/charm/nbi/src/charm.py
@@ -249,6 +249,7 @@ class NbiCharm(CharmedOsmBase):
                     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 5efaaaef..1c53163e 100755
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@ -149,6 +149,7 @@ class NgUiCharm(CharmedOsmBase):
                     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 5fdee723..cf4f9566 100755
--- a/installers/charm/prometheus/src/charm.py
+++ b/installers/charm/prometheus/src/charm.py
@@ -197,6 +197,7 @@ class PrometheusCharm(CharmedOsmBase):
                     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
-- 
2.17.1