X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fgrafana%2Fsrc%2Fcharm.py;h=9bc612e0cc00bb40ca04cb9ddd75630c38929996;hb=refs%2Fchanges%2F20%2F11120%2F2;hp=28be79aad3d204498cfedd9bbf61412dd484d804;hpb=457fde18dad36d9d58c794918ca79e6d72539bc1;p=osm%2Fdevops.git diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py index 28be79aa..9bc612e0 100755 --- a/installers/charm/grafana/src/charm.py +++ b/installers/charm/grafana/src/charm.py @@ -54,6 +54,7 @@ class ConfigModel(ModelValidator): ingress_class: Optional[str] ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] + image_pull_policy: Optional[str] @validator("max_file_size") def validate_max_file_size(cls, v): @@ -75,6 +76,18 @@ class ConfigModel(ModelValidator): ip_network(v) 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 GrafanaCharm(CharmedOsmBase): """GrafanaCharm Charm.""" @@ -137,7 +150,9 @@ class GrafanaCharm(CharmedOsmBase): # Create Builder for the PodSpec 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( "/api/health",