X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fmongodb-exporter%2Fsrc%2Fcharm.py;h=d839d82f57ae1e5234b60974ae7138726d50f265;hb=refs%2Fchanges%2F27%2F11127%2F2;hp=149940a6e01ed9e50b588995da132f23a4873bca;hpb=d68e0b4f0bc482d61f2e2a775b899237e15f93e9;p=osm%2Fdevops.git diff --git a/installers/charm/mongodb-exporter/src/charm.py b/installers/charm/mongodb-exporter/src/charm.py index 149940a6..d839d82f 100755 --- a/installers/charm/mongodb-exporter/src/charm.py +++ b/installers/charm/mongodb-exporter/src/charm.py @@ -53,6 +53,7 @@ class ConfigModel(ModelValidator): ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] mongodb_uri: Optional[str] + image_pull_policy: str @validator("site_url") def validate_site_url(cls, v): @@ -74,6 +75,18 @@ class ConfigModel(ModelValidator): raise ValueError("mongodb_uri is not properly formed") return v + @validator("image_pull_policy") + def validate_image_pull_policy(cls, v): + values = { + "always": "Always", + "ifnotpresent": "IfNotPresent", + "never": "Never", + } + v = v.lower() + if v not in values.keys(): + raise ValueError("value must be always, ifnotpresent or never") + return values[v] + class MongodbExporterCharm(CharmedOsmBase): def __init__(self, *args) -> NoReturn: @@ -131,7 +144,7 @@ class MongodbExporterCharm(CharmedOsmBase): if self.unit.is_leader(): self.dashboard_target.publish_info( name="osm-mongodb", - dashboard=Path("files/mongodb_exporter_dashboard.json").read_text(), + dashboard=Path("templates/mongodb_exporter_dashboard.json").read_text(), ) def _check_missing_dependencies(self, config: ConfigModel): @@ -173,7 +186,9 @@ class MongodbExporterCharm(CharmedOsmBase): pod_spec_builder = PodSpecV3Builder() # Build container - container_builder = ContainerV3Builder(self.app.name, image_info) + container_builder = ContainerV3Builder( + self.app.name, image_info, config.image_pull_policy + ) container_builder.add_port(name=self.app.name, port=PORT) container_builder.add_http_readiness_probe( path="/api/health",