X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fng-ui%2Fsrc%2Fcharm.py;h=39675d05732a0831abb3b2e5f6911d8b36e50748;hb=8d3b1402536f3adbcb82d0e2040fa30ac90b2761;hp=cf0b09109e4e59bb43c8c7893782fbf099e3fc24;hpb=3ddbbd1f6c70306d13db0976e1e6b3bda0c69abd;p=osm%2Fdevops.git diff --git a/installers/charm/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py index cf0b0910..39675d05 100755 --- a/installers/charm/ng-ui/src/charm.py +++ b/installers/charm/ng-ui/src/charm.py @@ -54,7 +54,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("port") def validate_port(cls, v): @@ -116,7 +117,7 @@ class NgUiCharm(CharmedOsmBase): files_builder = FilesV3Builder() files_builder.add_file( "default", - Template(Path("files/default").read_text()).substitute( + Template(Path("templates/default.template").read_text()).substitute( port=config.port, server_name=config.server_name, max_file_size=config.max_file_size, @@ -132,10 +133,15 @@ class NgUiCharm(CharmedOsmBase): # Check relations 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=config.port) container = container_builder.build()