projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e71d949
..
cf4f956
100755
(executable)
--- a/
installers/charm/prometheus/src/charm.py
+++ b/
installers/charm/prometheus/src/charm.py
@@
-112,13
+112,13
@@
class PrometheusCharm(CharmedOsmBase):
self.prometheus.publish_info(self.app.name, PORT)
def _on_backup_action(self, event: EventBase) -> NoReturn:
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/v
2
/admin/tsdb/snapshot"
+ url = f"http://{self.model.app.name}:{PORT}/api/v
1
/admin/tsdb/snapshot"
result = requests.post(url)
if result.status_code == 200:
event.set_results({"backup-name": result.json()["name"]})
else:
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()
def _build_files(self, config: ConfigModel):
files_builder = FilesV3Builder()
@@
-197,6
+197,7
@@
class PrometheusCharm(CharmedOsmBase):
if config.max_file_size > 0
else config.max_file_size
),
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
}
ingress_resource_builder = IngressResourceV3Builder(
f"{self.app.name}-ingress", annotations