Merge pull request #8827 from jackyalbo/jacky-fix1

Removing kube_pv_chown

Author: jackyalbo

.github/workflows/jest-unit-tests.yaml

@@ -14,6 +14,7 @@ jobs:
 
       - name: Run Jest Unit Test
         run: |
+          sudo apt-get update --fix-missing
           sudo apt-get -y install nasm libcap-dev
           npm install
           npm run build

src/deploy/NVA_build/NooBaa.Dockerfile

@@ -1,8 +1,7 @@
 ARG CENTOS_VER=9
 FROM noobaa-base AS server_builder
 
-RUN mkdir -p /noobaa_init_files && \
-    cp -p ./build/Release/kube_pv_chown /noobaa_init_files
+RUN mkdir -p /noobaa_init_files
 
 COPY . ./
 ARG GIT_COMMIT 
@@ -139,12 +138,7 @@ RUN chmod 775 /noobaa_init_files && \
     chmod -R g=u /noobaa_init_files/
 
 COPY --from=server_builder /kubectl /usr/local/bin/kubectl
-COPY --from=server_builder ./noobaa_init_files/kube_pv_chown /noobaa_init_files
-RUN mkdir -m 777 /root/node_modules && \
-    chown root:root /noobaa_init_files/kube_pv_chown && \
-    chmod 750 /noobaa_init_files/kube_pv_chown && \
-    chmod u+s /noobaa_init_files/kube_pv_chown
-
+RUN mkdir -m 777 /root/node_modules
 COPY --from=noobaa-base /root/node_modules /root/node_modules
 
 ###############

src/deploy/NVA_build/noobaa_core.yaml

@@ -275,7 +275,6 @@ spec:
         - name: init-mongo
           image: noobaa/noobaa-core:5.0.1
           imagePullPolicy: IfNotPresent
-          # command: ['/noobaa_init_files/kube_pv_chown', 'server']
           command: ["/noobaa_init_files/noobaa_init.sh", "init_mongo"]
           volumeMounts:
             - mountPath: /mongo_data

src/deploy/NVA_build/noobaa_init.sh

@@ -4,7 +4,6 @@ RUN_INIT=${1}
 NOOBAA_SUPERVISOR="/data/noobaa_supervisor.conf"
 NOOBAA_DATA_VERSION="/data/noobaa_version"
 NOOBAA_PACKAGE_PATH="/root/node_modules/noobaa-core/package.json"
-KUBE_PV_CHOWN="/noobaa_init_files/kube_pv_chown"
 
 update_services_autostart() {
   local programs=(webserver bg_workers hosted_agents s3rver)
@@ -143,18 +142,7 @@ prepare_server_pvs() {
 }
 
 prepare_mongo_pv() {
-  local main_dir="/mongo_data"
   local shard_dir="/mongo_data/mongo/cluster/shard1"
-  local recursive_file="/mongo_data/recursive_file"
-  local dir_id=$(stat -c '%u' ${main_dir})
-  local current_id=$(id -u)
-
-  # change ownership and permissions of mongo db path
-  if [ "${dir_id}" != "${current_id}" ] || [ ! -f ${recursive_file} ]; then
-    echo "uid change has been identified - will change from uid: ${dir_id} to new uid: ${current_id}"
-    time ${KUBE_PV_CHOWN} mongo ${current_id}
-    touch ${recursive_file}
-  fi
 
   if [ ! -d ${shard_dir} ]; then
     echo "creating shard directory: ${shard_dir}" 
@@ -164,19 +152,6 @@ prepare_mongo_pv() {
   fi
 }
 
-prepare_postgres_pv() {
-  local dir="/var/lib/pgsql"
-  local dir_id=$(stat -c '%u' ${dir})    
-  local current_id=$(id -u)
-
-  # change ownership and permissions of mongo db path
-  if [ "${dir_id}" != "${current_id}" ]
-  then
-    echo "uid change has been identified - will change from uid: ${dir_id} to new uid: ${current_id}"
-    time ${KUBE_PV_CHOWN} postgres ${current_id}
-  fi
-}
-
 init_endpoint() {
   fix_non_root_user
 
@@ -200,18 +175,6 @@ init_noobaa_server() {
 init_noobaa_agent() {
   fix_non_root_user
 
-  local dir="/noobaa_storage"
-  mkdir -p ${dir}
-  local dir_id=$(stat -c '%u' ${dir})    
-  local current_id=$(id -u)
-
-  # change ownership and permissions of noobaa_storage path
-  if [ "${dir_id}" != "${current_id}" ]
-  then
-    echo "uid change has been identified - will change from uid: ${dir_id} to new uid: ${current_id}"
-    time ${KUBE_PV_CHOWN} agent ${current_id}
-  fi
-
   cd /root/node_modules/noobaa-core/
   prepare_agent_conf
   run_internal_process node --unhandled-rejections=warn ./src/agent/agent_cli
@@ -230,9 +193,6 @@ then
 elif [ "${RUN_INIT}" == "init_mongo" ]
 then
   prepare_mongo_pv
-elif [ "${RUN_INIT}" == "init_postgres" ]
-then
-  prepare_postgres_pv
 elif [ "${RUN_INIT}" == "db_migrate" ]
 then
   migrate_dbs

src/native/nb_native.gyp

@@ -115,11 +115,5 @@
             'util/tpool.cpp',
             'util/tpool.h',
         ],
-    }, {
-        'target_name': 'kube_pv_chown',
-        'type': 'executable',
-        'sources': [
-            'tools/kube_pv_chown.cpp'
-        ]
     }],
 }