diff --git a/gen3/bin/kube-setup-gen3-user-data-library.sh b/gen3/bin/kube-setup-gen3-user-data-library.sh index 22e8c5e4a..130873ac3 100644 --- a/gen3/bin/kube-setup-gen3-user-data-library.sh +++ b/gen3/bin/kube-setup-gen3-user-data-library.sh @@ -9,8 +9,8 @@ gen3_load "gen3/gen3setup" setup_database() { gen3_log_info "setting up gen3-user-data-library service ..." - if g3kubectl describe secret gen3-user-data-library-g3auto > /dev/null 2>&1; then - gen3_log_info "gen3-user-data-library-g3auto secret already configured" + if g3kubectl describe secret gen3userdatalibrary-g3auto > /dev/null 2>&1; then + gen3_log_info "gen3userdatalibrary-g3auto secret already configured" return 0 fi if [[ -n "$JENKINS_HOME" || ! -f "$(gen3_secrets_folder)/creds.json" ]]; then @@ -45,7 +45,7 @@ EOM # make it easy for nginx to get the Authorization header ... echo -n "gateway:$password" | base64 > "$secretsFolder/base64Authz.txt" fi - gen3 secrets sync 'setup gen3-user-data-library-g3auto secrets' + gen3 secrets sync 'setup gen3userdatalibrary-g3auto secrets' } @@ -61,10 +61,10 @@ fi gen3 roll gen3-user-data-library g3kubectl apply -f "${GEN3_HOME}/kube/services/gen3-user-data-library/gen3-user-data-library-service.yaml" - -if [[ -z "$GEN3_ROLL_ALL" ]]; then - gen3 kube-setup-networkpolicy - gen3 kube-setup-revproxy -fi +# +#if [[ -z "$GEN3_ROLL_ALL" ]]; then +# gen3 kube-setup-networkpolicy +# gen3 kube-setup-revproxy +#fi gen3_log_info "The gen3-user-data-library service has been deployed onto the kubernetes cluster" diff --git a/kube/services/gen3-user-data-library/gen3-user-data-library-deploy.yaml b/kube/services/gen3-user-data-library/gen3-user-data-library-deploy.yaml index fcb7e63ba..0d56e0426 100644 --- a/kube/services/gen3-user-data-library/gen3-user-data-library-deploy.yaml +++ b/kube/services/gen3-user-data-library/gen3-user-data-library-deploy.yaml @@ -38,11 +38,7 @@ spec: - name: gen3-user-data-library-g3auto-volume readOnly: true mountPath: /gen3userdatalibrary/.env - subPath: env - - name: gen3-user-data-library-g3auto-volume - readOnly: true - mountPath: /gen3userdatalibrary/credentials.json - subPath: credentials.json + subPath: gen3-user-data-library.env imagePullPolicy: Always resources: requests: