Skip to content

Commit

Permalink
Feat/argo va testing revproxy modifications (#2466)
Browse files Browse the repository at this point in the history
* It can't be that easy

* It wasn't that easy. What we're going to do is use the manifest to tell us what namespace to look in, and then look there

* Dumb typo

* Yet another dumb typo

* Moving to a different setup, where specify the argo server URL in the manifest. This is more flexible

* I'm blaming the last commit on Monday brain

* It's a .conf file, not a yaml file

* Need to update in both places
  • Loading branch information
AidanHilt authored Feb 12, 2024
1 parent 0f98195 commit 8e02b09
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
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

0 comments on commit 8e02b09

Please sign in to comment.