Fix bug 1547: Add ingress.class annotation to OSM charms

[osm/devops.git] / installers / charm / prometheus / src / charm.py

diff --git a/installers/charm/prometheus/src/charm.py b/installers/charm/prometheus/src/charm.py
index 5cd163d..cf4f956 100755 (executable)
--- a/installers/charm/prometheus/src/charm.py
+++ b/installers/charm/prometheus/src/charm.py
@@ -55,6 +55,7 @@ class ConfigModel(ModelValidator):
     default_target: str
     max_file_size: int
     site_url: Optional[str]
+    cluster_issuer: Optional[str]
     ingress_whitelist_source_range: Optional[str]
     tls_secret_name: Optional[str]
     enable_web_admin_api: bool
@@ -111,13 +112,13 @@ class PrometheusCharm(CharmedOsmBase):
         self.prometheus.publish_info(self.app.name, PORT)
 
     def _on_backup_action(self, event: EventBase) -> NoReturn:
-        url = f"http://{self.model.app.name}:{PORT}/api/v2/admin/tsdb/snapshot"
+        url = f"http://{self.model.app.name}:{PORT}/api/v1/admin/tsdb/snapshot"
         result = requests.post(url)
 
         if result.status_code == 200:
             event.set_results({"backup-name": result.json()["name"]})
         else:
-            event.fail(f"status-code: {result.status_code}, result: {result.json()}")
+            event.fail(f"status-code: {result.status_code}")
 
     def _build_files(self, config: ConfigModel):
         files_builder = FilesV3Builder()
@@ -196,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
@@ -206,6 +208,9 @@ class PrometheusCharm(CharmedOsmBase):
                     "nginx.ingress.kubernetes.io/whitelist-source-range"
                 ] = config.ingress_whitelist_source_range
 
+            if config.cluster_issuer:
+                annotations["cert-manager.io/cluster-issuer"] = config.cluster_issuer
+
             if parsed.scheme == "https":
                 ingress_resource_builder.add_tls(
                     [parsed.hostname], config.tls_secret_name