diff --git a/files/squid_whitelist/web_whitelist b/files/squid_whitelist/web_whitelist index c62367982..219f6b41e 100644 --- a/files/squid_whitelist/web_whitelist +++ b/files/squid_whitelist/web_whitelist @@ -142,7 +142,6 @@ sa-update.space-pro.be security.debian.org services.mathworks.com streaming.stat.iastate.edu -support.datacommons.io us-central1-docker.pkg.dev www.google.com www.icpsr.umich.edu diff --git a/gen3/bin/kube-setup-revproxy.sh b/gen3/bin/kube-setup-revproxy.sh index 72cc21bf5..97b91b65a 100644 --- a/gen3/bin/kube-setup-revproxy.sh +++ b/gen3/bin/kube-setup-revproxy.sh @@ -105,18 +105,15 @@ for name in $(g3kubectl get services -o json | jq -r '.items[] | .metadata.name' fi done -if [[ $current_namespace == "default" ]]; +if g3kubectl get namespace argo > /dev/null 2>&1; then - if g3kubectl get namespace argo > /dev/null 2>&1; - then - for argo in $(g3kubectl get services -n argo -o jsonpath='{.items[*].metadata.name}'); - do - filePath="$scriptDir/gen3.nginx.conf/${argo}.conf" - if [[ -f "$filePath" ]]; then - confFileList+=("--from-file" "$filePath") - fi - done - fi + for argo in $(g3kubectl get services -n argo -o jsonpath='{.items[*].metadata.name}'); + do + filePath="$scriptDir/gen3.nginx.conf/${argo}.conf" + if [[ -f "$filePath" ]]; then + confFileList+=("--from-file" "$filePath") + fi + done fi if [[ $current_namespace == "default" ]]; diff --git a/gen3/lib/testData/test1.manifest.g3k/expectedFenceResult.yaml b/gen3/lib/testData/test1.manifest.g3k/expectedFenceResult.yaml index da0661e20..66fb41ca4 100644 --- a/gen3/lib/testData/test1.manifest.g3k/expectedFenceResult.yaml +++ b/gen3/lib/testData/test1.manifest.g3k/expectedFenceResult.yaml @@ -275,6 +275,7 @@ spec: if fence-create migrate --help > /dev/null 2>&1; then if ! grep -E 'ENABLE_DB_MIGRATION"?: *false' /var/www/fence/fence-config.yaml; then echo "Running db migration: fence-create migrate" + cd /fence fence-create migrate else echo "Db migration disabled in fence-config"