Merge branch 'master' into chore/fence_deploy_azlinux

uc-cdis · Jan 14, 2025 · 625502e · 625502e
2 parents da48642 + fef3d7c
commit 625502e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/gen3/bin/kube-setup-gen3-user-data-library.sh b/gen3/bin/kube-setup-gen3-user-data-library.sh
@@ -13,10 +13,6 @@ setup_database() {
     gen3_log_info "gen3userdatalibrary-g3auto secret already configured"
     return 0
   fi
-  if [[ -n "$JENKINS_HOME" || ! -f "$(gen3_secrets_folder)/creds.json" ]]; then
-    gen3_log_err "skipping db setup in non-adminvm environment"
-    return 0
-  fi
   # Setup .env file that gen3-user-data-library service consumes
   if [[ ! -f "$secretsFolder/gen3-user-data-library.env" || ! -f "$secretsFolder/base64Authz.txt" ]]; then
     local secretsFolder="$(gen3_secrets_folder)/g3auto/gen3userdatalibrary"

diff --git a/kube/services/spark/spark-deploy.yaml b/kube/services/spark/spark-deploy.yaml
@@ -87,9 +87,6 @@ spec:
           args: 
             - "-c"
             - |
-              # get /usr/local/share/ca-certificates/cdis-ca.crt into system bundle
-              ssh server sudo /etc/init.d/ssh start
-              update-ca-certificates
               python run_config.py
               hdfs namenode -format
               hdfs --daemon start namenode