Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/argo va testing revproxy modifications #2466

Merged
merged 10 commits into from
Feb 12, 2024
17 changes: 8 additions & 9 deletions gen3/bin/kube-setup-revproxy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,14 @@ for name in $(g3kubectl get services -o json | jq -r '.items[] | .metadata.name'
fi
done

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

if g3k_manifest_lookup .argo.argo_server_service_url 2> /dev/null; then
argo_server_service_url=$(g3k_manifest_lookup .argo.argo_server_service_url)
g3k_kv_filter "${scriptDir}/gen3.nginx.conf/argo-server.conf" SERVICE_URL "${argo_server_service_url}" > /tmp/argo-server-with-url.conf
filePath="/tmp/argo-server-with-url.conf"
if [[ -f "$filePath" ]]; then
confFileList+=("--from-file" "$filePath")
fi
fi

if g3kubectl get namespace argocd > /dev/null 2>&1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
auth_request /gen3-authz;

set $proxy_service "argo";
set $upstream http://argo-argo-workflows-server.argo.svc.cluster.local:2746;
set $upstream SERVICE_URL;

rewrite ^/argo/(.*) /$1 break;

Expand Down
Loading