Skip to content

Commit

Permalink
Merge pull request #254 from FraunhoferISST/feat/nginx-rate-limiting
Browse files Browse the repository at this point in the history
Added rate limiting to nginx
  • Loading branch information
tom-rm-meyer-ISST authored Feb 20, 2024
2 parents 5c3ef7f + 9418c68 commit d1dd72f
Show file tree
Hide file tree
Showing 10 changed files with 516 additions and 431 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/helm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ jobs:
- name: Run chart-testing (install)
run: |
helm repo add bitnami https://charts.bitnami.com/bitnami
helm dependency update
helm repo add postgresql https://charts.bitnami.com/bitnami
ct install --charts charts/puris --helm-extra-set-args "--set backend.image.repository=${{ env.REGISTRY }}/${{ env.APP_BACKEND_NAME}} --set backend.image.tag=${{ env.TAG }} --set frontend.image.repository=${{ env.REGISTRY }}/${{ env.APP_FRONTEND_NAME }} --set frontend.image.tag=${{ env.TAG }}"
if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
4 changes: 2 additions & 2 deletions charts/puris/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ description: A helm chart for Kubernetes deployment of PURIS
type: application
home: https://github.com/eclipse-tractusx/puris
sources:
- https://github.com/eclipse-tractusx/puris
- https://github.com/eclipse-tractusx/puris
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -35,7 +35,7 @@ dependencies:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.0
version: 1.0.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
5 changes: 5 additions & 0 deletions charts/puris/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ $ helm install puris --namespace puris --create-namespace .
| frontend.puris.keycloak.realm | string | `"Catena-X"` | Name of the Realm of the keycloak instance. |
| frontend.puris.keycloak.redirectUrlFrontend | string | `"https://your-frontend-url.com"` | URL to use as keycloak redirect url. |
| frontend.puris.keycloak.url | string | `"https://idp.com/auth"` | The URL to the IDP that should be used. |
| frontend.puris.rateLimiting.burst | int | `30` | Burst rate limiting for nginx. |
| frontend.puris.rateLimiting.limit | string | `"10m"` | Bucket zone limit for rate limiting in nginx. |
| frontend.puris.rateLimiting.rate | string | `"10r/s"` | Allowed rates per second for nginx rate limiting. |
| frontend.readinessProbe | object | `{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Checks if the pod is fully ready to operate |
| frontend.readinessProbe.failureThreshold | int | `3` | Number of failures (threshold) for a readiness probe |
| frontend.readinessProbe.initialDelaySeconds | int | `10` | Delay in seconds after which an initial readiness probe is checked |
Expand Down Expand Up @@ -182,3 +185,5 @@ $ helm install puris --namespace puris --create-namespace .
| postgresql.fullnameOverride | string | `"backend-postgresql"` | Possibility to override the fullname |
| postgresql.service.ports.postgresql | int | `5432` | Port of postgres database. |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
6 changes: 6 additions & 0 deletions charts/puris/templates/frontend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ spec:
value: "{{ .Values.frontend.puris.keycloak.clientId }}"
- name: IDP_REDIRECT_URL_FRONTEND
value: "{{ .Values.frontend.puris.keycloak.redirectUrlFrontend }}"
- name: NGINX_RATE_LIMIT
value: "{{ .Values.frontend.puris.rateLimiting.limit }}"
- name: NGINX_BURST
value: "{{ .Values.frontend.puris.rateLimiting.burst }}"
- name: NGINX_RATE
value: "{{ .Values.frontend.puris.rateLimiting.rate }}"
ports:
- name: http
containerPort: {{ .Values.frontend.service.port }}
Expand Down
Loading

0 comments on commit d1dd72f

Please sign in to comment.