From 0dc25b3c932a7831f23e8d93d6d75be5c284877e Mon Sep 17 00:00:00 2001 From: sousaedu Date: Mon, 30 Aug 2021 16:33:33 +0100 Subject: [PATCH] Fix validation error for ImagePullPolicy in charms Change-Id: I00711202fdbacd73e9205dd3fc34424893440be5 Signed-off-by: sousaedu --- installers/charm/grafana/src/charm.py | 2 +- installers/charm/kafka-exporter/src/charm.py | 2 +- installers/charm/keystone/src/charm.py | 2 +- installers/charm/lcm/src/charm.py | 2 +- installers/charm/lcm/tests/test_charm.py | 2 +- installers/charm/mon/src/charm.py | 2 +- installers/charm/mongodb-exporter/src/charm.py | 2 +- installers/charm/mysqld-exporter/src/charm.py | 2 +- installers/charm/nbi/src/charm.py | 2 +- installers/charm/ng-ui/src/charm.py | 2 +- installers/charm/pla/src/charm.py | 2 +- installers/charm/pol/src/charm.py | 2 +- installers/charm/prometheus/src/charm.py | 2 +- installers/charm/ro/src/charm.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/installers/charm/grafana/src/charm.py b/installers/charm/grafana/src/charm.py index c482bbbc..e20a0524 100755 --- a/installers/charm/grafana/src/charm.py +++ b/installers/charm/grafana/src/charm.py @@ -58,7 +58,7 @@ class ConfigModel(ModelValidator): ingress_class: Optional[str] ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): diff --git a/installers/charm/kafka-exporter/src/charm.py b/installers/charm/kafka-exporter/src/charm.py index 21477816..7eaa2a0c 100755 --- a/installers/charm/kafka-exporter/src/charm.py +++ b/installers/charm/kafka-exporter/src/charm.py @@ -52,7 +52,7 @@ class ConfigModel(ModelValidator): ingress_class: Optional[str] ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("site_url") def validate_site_url(cls, v): diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py index 4e04e88a..51ee6ad5 100755 --- a/installers/charm/keystone/src/charm.py +++ b/installers/charm/keystone/src/charm.py @@ -84,7 +84,7 @@ class ConfigModel(ModelValidator): mysql_host: Optional[str] mysql_port: Optional[int] mysql_root_password: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("max_file_size") def validate_max_file_size(cls, v): diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py index af407e92..01ac0bf5 100755 --- a/installers/charm/lcm/src/charm.py +++ b/installers/charm/lcm/src/charm.py @@ -110,7 +110,7 @@ class ConfigModel(ModelValidator): vca_model_config_update_status_hook_interval: Optional[str] vca_stablerepourl: Optional[str] vca_helm_ca_certs: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): diff --git a/installers/charm/lcm/tests/test_charm.py b/installers/charm/lcm/tests/test_charm.py index 3e6b2a4f..1378e5c7 100644 --- a/installers/charm/lcm/tests/test_charm.py +++ b/installers/charm/lcm/tests/test_charm.py @@ -31,7 +31,7 @@ from ops.testing import Harness class TestCharm(unittest.TestCase): - """Prometheus Charm unit tests.""" + """LCM Charm unit tests.""" def setUp(self) -> NoReturn: """Test setup""" diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py index f253c093..e1340416 100755 --- a/installers/charm/mon/src/charm.py +++ b/installers/charm/mon/src/charm.py @@ -80,7 +80,7 @@ class ConfigModel(ModelValidator): grafana_user: str grafana_password: str certificates: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): diff --git a/installers/charm/mongodb-exporter/src/charm.py b/installers/charm/mongodb-exporter/src/charm.py index ad596c33..d839d82f 100755 --- a/installers/charm/mongodb-exporter/src/charm.py +++ b/installers/charm/mongodb-exporter/src/charm.py @@ -53,7 +53,7 @@ class ConfigModel(ModelValidator): ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] mongodb_uri: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("site_url") def validate_site_url(cls, v): diff --git a/installers/charm/mysqld-exporter/src/charm.py b/installers/charm/mysqld-exporter/src/charm.py index a351d2bb..a0015cc1 100755 --- a/installers/charm/mysqld-exporter/src/charm.py +++ b/installers/charm/mysqld-exporter/src/charm.py @@ -53,7 +53,7 @@ class ConfigModel(ModelValidator): ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] mysql_uri: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("site_url") def validate_site_url(cls, v): diff --git a/installers/charm/nbi/src/charm.py b/installers/charm/nbi/src/charm.py index 0e360738..1460459a 100755 --- a/installers/charm/nbi/src/charm.py +++ b/installers/charm/nbi/src/charm.py @@ -61,7 +61,7 @@ class ConfigModel(ModelValidator): ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] mongodb_uri: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("auth_backend") def validate_auth_backend(cls, v): diff --git a/installers/charm/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py index 56644f2e..7d8c59cb 100755 --- a/installers/charm/ng-ui/src/charm.py +++ b/installers/charm/ng-ui/src/charm.py @@ -54,7 +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] + image_pull_policy: str @validator("port") def validate_port(cls, v): diff --git a/installers/charm/pla/src/charm.py b/installers/charm/pla/src/charm.py index 2a08ea59..ba3b1ff0 100755 --- a/installers/charm/pla/src/charm.py +++ b/installers/charm/pla/src/charm.py @@ -46,7 +46,7 @@ class ConfigModel(ModelValidator): database_commonkey: str mongodb_uri: Optional[str] log_level: str - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): diff --git a/installers/charm/pol/src/charm.py b/installers/charm/pol/src/charm.py index d1341c11..36eb8c60 100755 --- a/installers/charm/pol/src/charm.py +++ b/installers/charm/pol/src/charm.py @@ -49,7 +49,7 @@ class ConfigModel(ModelValidator): log_level: str mongodb_uri: Optional[str] mysql_uri: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): diff --git a/installers/charm/prometheus/src/charm.py b/installers/charm/prometheus/src/charm.py index 3dcb5d41..e79de698 100755 --- a/installers/charm/prometheus/src/charm.py +++ b/installers/charm/prometheus/src/charm.py @@ -60,7 +60,7 @@ class ConfigModel(ModelValidator): ingress_whitelist_source_range: Optional[str] tls_secret_name: Optional[str] enable_web_admin_api: bool - image_pull_policy: Optional[str] + image_pull_policy: str @validator("web_subpath") def validate_web_subpath(cls, v): diff --git a/installers/charm/ro/src/charm.py b/installers/charm/ro/src/charm.py index 52123937..9b2934f3 100755 --- a/installers/charm/ro/src/charm.py +++ b/installers/charm/ro/src/charm.py @@ -73,7 +73,7 @@ class ConfigModel(ModelValidator): ro_database: str openmano_tenant: str certificates: Optional[str] - image_pull_policy: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): -- 2.17.1