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: integrate diracx-web #46

Merged
merged 4 commits into from
Oct 8, 2023
Merged

Conversation

aldbr
Copy link
Contributor

@aldbr aldbr commented Oct 3, 2023

Aims at deploying diracx-web along with diracx.

  • diracx-web should be available under http://localhost:8000/
  • diracx should be available under http://localhost:8000/api

@aldbr aldbr force-pushed the main_FEAT_webapp branch from 1cb1cc1 to 7e588c7 Compare October 4, 2023 11:38
@aldbr
Copy link
Contributor Author

aldbr commented Oct 4, 2023

FYI, there is a kind of bug with helm lint: helm/helm#10149 (comment)

As you can see here, I replaced {{ - if ... by {{ if to fix the issue: https://github.com/DIRACGrid/diracx-charts/pull/46/files#diff-d45fc086c3b32f8518d679b76fabb0183c0876d79abbf7e134662aeaa42894d8R61-R63

helm template looks good so I think it is fine.

@aldbr aldbr marked this pull request as ready for review October 4, 2023 11:48
@aldbr aldbr force-pushed the main_FEAT_webapp branch from 593af07 to 58b7e62 Compare October 5, 2023 12:01
diracx/values.yaml Outdated Show resolved Hide resolved
@chrisburr
Copy link
Member

chrisburr commented Oct 6, 2023

At the moment using this with DIRACGrid/diracx#127 results in swagger not working as it can't find /openapi.json. I guess setting openapi_url="/api/openapi.json" makes the most sense?

demo/values.tpl.yaml Outdated Show resolved Hide resolved
@aldbr
Copy link
Contributor Author

aldbr commented Oct 6, 2023

At the moment using this with DIRACGrid/diracx#127 results in swagger not working as it can't find /openapi.json. I guess setting openapi_url="/api/openapi.json" makes the most sense?

You mean that you cannot access http://localhost:8000/api/docs?

@chrisburr
Copy link
Member

You mean that you cannot access http://localhost:8000/api/docs?

No, I mean when I access it I get:

Failed to load API definition.
Errors: Fetch error: Not Found /openapi.json

(though if you don't see this I might have applied the PRs incorrectly)

@aldbr
Copy link
Contributor Author

aldbr commented Oct 6, 2023

(though if you don't see this I might have applied the PRs incorrectly)

This is weird, I don't have this issue on my side, I will check again

@chrisburr
Copy link
Member

It's probably my fault for badly rebasing #47 😄

@aldbr aldbr force-pushed the main_FEAT_webapp branch from a09ca45 to 4f89951 Compare October 6, 2023 14:46
@chrisburr chrisburr merged commit 137b4c7 into DIRACGrid:master Oct 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants