@@ -5,11 +5,9 @@ use crate::discovery::{self, build_discovery_configmaps};
5
5
6
6
use snafu:: { OptionExt , ResultExt , Snafu } ;
7
7
use stackable_opa_crd:: { OpaCluster , OpaRole , OpaStorageConfig , APP_NAME , OPERATOR_NAME } ;
8
+ use stackable_operator:: k8s_openapi:: api:: core:: v1:: PodSecurityContext ;
8
9
use stackable_operator:: {
9
- builder:: {
10
- ConfigMapBuilder , ContainerBuilder , FieldPathEnvVar , ObjectMetaBuilder , PodBuilder ,
11
- SecurityContextBuilder ,
12
- } ,
10
+ builder:: { ConfigMapBuilder , ContainerBuilder , FieldPathEnvVar , ObjectMetaBuilder , PodBuilder } ,
13
11
commons:: resources:: { NoRuntimeLimits , Resources } ,
14
12
k8s_openapi:: {
15
13
api:: {
@@ -481,19 +479,12 @@ fn build_server_rolegroup_daemonset(
481
479
"-x" . to_string( ) ,
482
480
"-c" . to_string( ) ,
483
481
[
484
- format!( "mkdir -p {}" , BUNDLES_ACTIVE_DIR ) ,
485
- format!( "mkdir -p {}" , BUNDLES_INCOMING_DIR ) ,
486
- format!( "mkdir -p {}" , BUNDLES_TMP_DIR ) ,
487
- format!( "chown -R stackable:stackable {}" , BUNDLES_ACTIVE_DIR ) ,
488
- format!( "chown -R stackable:stackable {}" , BUNDLES_INCOMING_DIR ) ,
489
- format!( "chown -R stackable:stackable {}" , BUNDLES_TMP_DIR ) ,
490
- format!( "chmod -R a=,u=rwX {}" , BUNDLES_ACTIVE_DIR ) ,
491
- format!( "chmod -R a=,u=rwX {}" , BUNDLES_INCOMING_DIR ) ,
492
- format!( "chmod -R a=,u=rwX {}" , BUNDLES_TMP_DIR ) ,
482
+ format!( "mkdir -p {BUNDLES_ACTIVE_DIR}" ) ,
483
+ format!( "mkdir -p {BUNDLES_INCOMING_DIR}" ) ,
484
+ format!( "mkdir -p {BUNDLES_TMP_DIR}" ) ,
493
485
]
494
486
. join( " && " ) ,
495
487
] )
496
- . security_context ( SecurityContextBuilder :: run_as_root ( ) )
497
488
. add_volume_mount ( "bundles" , "/bundles" )
498
489
. build ( ) ;
499
490
@@ -546,6 +537,12 @@ fn build_server_rolegroup_daemonset(
546
537
..Volume :: default ( )
547
538
} )
548
539
. service_account_name ( sa_name)
540
+ . security_context ( PodSecurityContext {
541
+ run_as_user : Some ( 1000 ) ,
542
+ run_as_group : Some ( 1000 ) ,
543
+ fs_group : Some ( 1000 ) ,
544
+ ..PodSecurityContext :: default ( )
545
+ } )
549
546
. build_template ( ) ,
550
547
..DaemonSetSpec :: default ( )
551
548
} ) ,
0 commit comments