X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fkafka-exporter%2Fsrc%2Fcharm.py;h=1316a4df215168e8dd3da4867a656492c6237ff6;hb=024b5ed16fec7f12bd1053e4d0154919b523b36a;hp=2147781617f99303a33d45caa0773f636340e29a;hpb=d680be4f261d4c580fcdf75abe11cfc29003915d;p=osm%2Fdevops.git diff --git a/installers/charm/kafka-exporter/src/charm.py b/installers/charm/kafka-exporter/src/charm.py index 21477816..1316a4df 100755 --- a/installers/charm/kafka-exporter/src/charm.py +++ b/installers/charm/kafka-exporter/src/charm.py @@ -52,7 +52,8 @@ 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 + security_context: bool @validator("site_url") def validate_site_url(cls, v): @@ -151,7 +152,10 @@ class KafkaExporterCharm(CharmedOsmBase): """ 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 missing_relations: @@ -173,11 +177,16 @@ class KafkaExporterCharm(CharmedOsmBase): self._check_missing_dependencies(config) # Create Builder for the PodSpec - pod_spec_builder = PodSpecV3Builder() + pod_spec_builder = PodSpecV3Builder( + enable_security_context=config.security_context + ) # 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=config.security_context, ) container_builder.add_port(name=self.app.name, port=PORT) container_builder.add_http_readiness_probe( @@ -236,8 +245,6 @@ class KafkaExporterCharm(CharmedOsmBase): ingress_resource = ingress_resource_builder.build() pod_spec_builder.add_ingress_resource(ingress_resource) - logger.debug(pod_spec_builder.build()) - return pod_spec_builder.build()