X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fnbi%2Fsrc%2Fcharm.py;h=c6a7c1eab9e5eaf51418d9457a7d4c16f67e4c61;hb=refs%2Fchanges%2F07%2F11307%2F3;hp=a47f618b75d06cfc176402062fad2046250fe19b;hpb=141d935cdb913100f3abdfaf52a67d90dd6b5016;p=osm%2Fdevops.git diff --git a/installers/charm/nbi/src/charm.py b/installers/charm/nbi/src/charm.py index a47f618b..c6a7c1ea 100755 --- a/installers/charm/nbi/src/charm.py +++ b/installers/charm/nbi/src/charm.py @@ -63,6 +63,8 @@ class ConfigModel(ModelValidator): tls_secret_name: Optional[str] mongodb_uri: Optional[str] image_pull_policy: str + debug_mode: bool + security_context: bool @validator("auth_backend") def validate_auth_backend(cls, v): @@ -160,7 +162,10 @@ class NbiCharm(CharmedOsmBase): def _check_missing_dependencies(self, config: ConfigModel): missing_relations = [] - if self.kafka_client.is_missing_data_in_unit(): + if ( + self.kafka_client.is_missing_data_in_unit() + and self.kafka_client.is_missing_data_in_app() + ): missing_relations.append("kafka") if not config.mongodb_uri and self.mongodb_client.is_missing_data_in_unit(): missing_relations.append("mongodb") @@ -183,8 +188,14 @@ class NbiCharm(CharmedOsmBase): # Check relations self._check_missing_dependencies(config) + security_context_enabled = ( + config.security_context if not config.debug_mode else False + ) + # Create Builder for the PodSpec - pod_spec_builder = PodSpecV3Builder() + pod_spec_builder = PodSpecV3Builder( + enable_security_context=security_context_enabled + ) # Add secrets to the pod mongodb_secret_name = f"{self.app.name}-mongodb-secret" @@ -211,7 +222,10 @@ class NbiCharm(CharmedOsmBase): # Build Container container_builder = ContainerV3Builder( - self.app.name, image_info, config.image_pull_policy + self.app.name, + image_info, + config.image_pull_policy, + run_as_non_root=security_context_enabled, ) container_builder.add_port(name=self.app.name, port=PORT) container_builder.add_tcpsocket_readiness_probe(