Skip to content

Commit

Permalink
Merge pull request #136 from QCDIS/20-django-api-token
Browse files Browse the repository at this point in the history
20 django api token
  • Loading branch information
skoulouzis authored Sep 11, 2023
2 parents 6fc18ed + 79c38e1 commit bfcf696
Show file tree
Hide file tree
Showing 22 changed files with 230 additions and 443 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,4 @@ jspm_packages
/package-lock.json

tilt/helm-values-secrets.yaml
tilt/helm-n-a-a-vre-secrets.yaml
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ conda install -c conda-forge tilt
conda install -c conda-forge minikube
```

Follow step 3 of the [minikube ingress-dns setup guide](https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/).
Follow step 3 section 'Linux OS with Network Manager' of the [minikube ingress-dns setup guide](https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/).


#### Add secrets

Expand Down Expand Up @@ -210,6 +211,12 @@ echo -n $ARGO_TOKEN | base64 -w 0
)
```

## Test Submit Workflow

```shell
curl -X POST "http://paas.minikube.test/vre-api-test/api/workflows/submit/" -H "Authorization: Token ${accessToken}" -H "Content-Type: application/json" -d "@vreapis/tests/resources/workflows/submit_workflow_req_body.json"
```


# Authorization

Expand All @@ -229,7 +236,8 @@ echo -n $ARGO_TOKEN | base64 -w 0
```

# Releases
If we want to add a new release environment we need to add a new .env.{ENV_NAME} together with a new line in the matrix on the .workflows/make.yaml and .workflows/make-release.yaml
If we want to add a new release environment we need to add a new .env.{ENV_NAME} together with a new line in the matrix
on the .workflows/make.yaml and .workflows/make-release.yaml


# Install GitGuardian pre-commit hook
Expand Down
13 changes: 13 additions & 0 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,25 @@ load('ext://helm_remote', 'helm_remote')
helm_remote(
'vrepaas',
repo_name='oci://ghcr.io/qcdis/charts',
version='0.5.2',
values=[
'./tilt/helm-values-dev.yaml',
'./tilt/helm-values-secrets.yaml',
],
)



helm_remote(
'jupyterhub',
repo_url='https://jupyterhub.github.io/helm-chart/',
values=[
'./tilt/helm-n-a-a-vre-secrets.yaml',
],
)



docker_build(
'qcdis/vreapi',
context='.',
Expand Down
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ dependencies:
- minikube
- requests
- whitenoise
- django-keycloak-auth
- gunicorn
- pyyaml
- python-dotenv
- django-cors-headers
- django-extensions
- pre_commit



Expand Down
41 changes: 0 additions & 41 deletions k8s/ingress.yaml

This file was deleted.

157 changes: 0 additions & 157 deletions k8s/test-vreapis/deployment.yaml

This file was deleted.

62 changes: 0 additions & 62 deletions k8s/vre-panel/deployment.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions k8s/vre-panel/service.yaml

This file was deleted.

Loading

0 comments on commit bfcf696

Please sign in to comment.