@@ -383,7 +383,7 @@ fn rolegroup_statefulset(
383
383
}
384
384
HdfsRole :: JournalNode => {
385
385
replicas = hdfs. rolegroup_journalnode_replicas ( rolegroup_ref) ?;
386
- init_containers = journalnode_init_containers ( hadoop_container ) ;
386
+ init_containers = None ;
387
387
containers = journalnode_containers ( rolegroup_ref, hadoop_container, & resources) ?;
388
388
}
389
389
}
@@ -408,8 +408,8 @@ fn rolegroup_statefulset(
408
408
service_account : Some ( rbac_sa. to_string ( ) ) ,
409
409
security_context : Some (
410
410
PodSecurityContextBuilder :: new ( )
411
- . run_as_user ( rbac :: HDFS_UID )
412
- . run_as_group ( 0 )
411
+ . run_as_user ( 1000 )
412
+ . run_as_group ( 1000 )
413
413
. fs_group ( 1000 ) // Needed for secret-operator
414
414
. build ( ) ,
415
415
) ,
@@ -622,15 +622,13 @@ fn datanode_init_containers(
622
622
namenode_podrefs : & [ HdfsPodRef ] ,
623
623
hadoop_container : & Container ,
624
624
) -> Option < Vec < Container > > {
625
- Some ( vec ! [
626
- chown_init_container( & HdfsNodeDataDirectory :: default ( ) . datanode, hadoop_container) ,
627
- Container {
628
- name: "wait-for-namenodes" . to_string( ) ,
629
- args: Some ( vec![
630
- "sh" . to_string( ) ,
631
- "-c" . to_string( ) ,
632
- format!(
633
- "
625
+ Some ( vec ! [ Container {
626
+ name: "wait-for-namenodes" . to_string( ) ,
627
+ args: Some ( vec![
628
+ "sh" . to_string( ) ,
629
+ "-c" . to_string( ) ,
630
+ format!(
631
+ "
634
632
echo \" Waiting for namenodes to get ready:\"
635
633
n=0
636
634
while [ ${{n}} -lt 12 ];
@@ -658,32 +656,23 @@ fn datanode_init_containers(
658
656
sleep 5
659
657
done
660
658
" ,
661
- hadoop_home = HADOOP_HOME ,
662
- pod_names = namenode_podrefs
663
- . iter( )
664
- . map( |pod_ref| pod_ref. pod_name. as_ref( ) )
665
- . collect:: <Vec <& str >>( )
666
- . join( " " )
667
- ) ,
668
- ] ) ,
669
- ..hadoop_container. clone( )
670
- } ,
671
- ] )
672
- }
673
-
674
- fn journalnode_init_containers ( hadoop_container : & Container ) -> Option < Vec < Container > > {
675
- Some ( vec ! [ chown_init_container(
676
- & HdfsNodeDataDirectory :: default ( ) . journalnode,
677
- hadoop_container,
678
- ) ] )
659
+ hadoop_home = HADOOP_HOME ,
660
+ pod_names = namenode_podrefs
661
+ . iter( )
662
+ . map( |pod_ref| pod_ref. pod_name. as_ref( ) )
663
+ . collect:: <Vec <& str >>( )
664
+ . join( " " )
665
+ ) ,
666
+ ] ) ,
667
+ ..hadoop_container. clone( )
668
+ } ] )
679
669
}
680
670
681
671
fn namenode_init_containers (
682
672
namenode_podrefs : & [ HdfsPodRef ] ,
683
673
hadoop_container : & Container ,
684
674
) -> Option < Vec < Container > > {
685
675
Some ( vec ! [
686
- chown_init_container( & HdfsNodeDataDirectory :: default ( ) . namenode, hadoop_container) ,
687
676
Container {
688
677
name: "format-namenode" . to_string( ) ,
689
678
args: Some ( vec![
@@ -733,6 +722,7 @@ fn namenode_init_containers(
733
722
] ) ,
734
723
security_context: Some ( SecurityContext {
735
724
run_as_user: Some ( 1000 ) ,
725
+ run_as_group: Some ( 1000 ) ,
736
726
..SecurityContext :: default ( )
737
727
} ) ,
738
728
..hadoop_container. clone( )
@@ -749,27 +739,6 @@ fn namenode_init_containers(
749
739
] )
750
740
}
751
741
752
- /// Creates a container that chowns and chmods the provided `node_dir`.
753
- fn chown_init_container ( node_dir : & str , hadoop_container : & Container ) -> Container {
754
- Container {
755
- name : "chown-data" . to_string ( ) ,
756
- args : Some ( vec ! [
757
- "sh" . to_string( ) ,
758
- "-c" . to_string( ) ,
759
- format!(
760
- "mkdir -p {node_dir} && chown -R stackable:stackable {data_dir} && chmod -R a=,u=rwX {data_dir}" ,
761
- node_dir = node_dir,
762
- data_dir = ROOT_DATA_DIR
763
- ) ,
764
- ] ) ,
765
- security_context : Some ( SecurityContext {
766
- run_as_user : Some ( 0 ) ,
767
- ..SecurityContext :: default ( )
768
- } ) ,
769
- ..hadoop_container. clone ( )
770
- }
771
- }
772
-
773
742
/// Creates a probe for [`stackable_operator::k8s_openapi::api::core::v1::TCPSocketAction`]
774
743
/// for liveness or readiness probes
775
744
fn tcp_socket_action_probe (
0 commit comments