Merge pull request #200 from RADAR-base/remove-rate-limited-mp

Removed rate limiter from management portal
RADAR-base · Jun 18, 2024 · b2fc1fb · b2fc1fb
2 parents 0145d69 + 6feb539
commit b2fc1fb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 90 deletions.
diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.0.0"
 description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base.
 name: management-portal
-version: 1.1.5
+version: 1.1.6
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/management-portal

diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md
@@ -3,7 +3,7 @@
 # management-portal
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/management-portal)](https://artifacthub.io/packages/helm/radar-base/management-portal)
 
-![Version: 1.1.5](https://img.shields.io/badge/Version-1.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base.
 
@@ -43,19 +43,12 @@ A Helm chart for RADAR-Base Management Portal to manage projects and participant
 | service.type | string | `"ClusterIP"` | Kubernetes Service type |
 | service.port | int | `8080` | Management Portal port |
 | ingress.enabled | bool | `true` | Enable ingress controller resource |
-| ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer and rate limiter |
+| ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer |
 | ingress.path | string | `"/managementportal"` | Path within the url structure |
 | ingress.pathType | string | `"ImplementationSpecific"` | Ingress Path type |
 | ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) |
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
 | ingress.tls.secretName | string | `"radar-base-tls-managementportal"` | TLS Secret Name |
-| ingress_rate_limited.enabled | bool | `true` | Enable ingress controller resource |
-| ingress_rate_limited.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer and rate limiter |
-| ingress_rate_limited.paths | list | `["/managementportal/oauth/token","/managementportal/login","/managementportal/api/meta-token"]` | Path within the url structure |
-| ingress_rate_limited.pathType | string | `"ImplementationSpecific"` | Ingress Path type |
-| ingress_rate_limited.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) |
-| ingress_rate_limited.hosts | list | `["localhost"]` | Hosts to accept requests from |
-| ingress_rate_limited.tls.secretName | string | `"radar-base-tls-managementportal-rate-limited"` | TLS Secret Name |
 | resources.limits | object | `{"cpu":2,"memory":"1700Mi"}` | CPU/Memory resource limits |
 | resources.requests | object | `{"cpu":"100m","memory":"512Mi"}` | CPU/Memory resource requests |
 | nodeSelector | object | `{}` | Node labels for pod assignment |

diff --git a/charts/management-portal/templates/ingress-rate-limited.yaml b/charts/management-portal/templates/ingress-rate-limited.yaml
diff --git a/charts/management-portal/values.yaml b/charts/management-portal/values.yaml
@@ -43,7 +43,7 @@ service:
 ingress:
   # -- Enable ingress controller resource
   enabled: true
-  # -- Annotations that define default ingress class, certificate issuer and rate limiter
+  # -- Annotations that define default ingress class, certificate issuer
   # @default -- check values.yaml
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
@@ -61,32 +61,6 @@ ingress:
     # -- TLS Secret Name
     secretName: radar-base-tls-managementportal
 
-ingress_rate_limited:
-  # -- Enable ingress controller resource
-  enabled: true
-  # -- Annotations that define default ingress class, certificate issuer and rate limiter
-  # @default -- check values.yaml
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/server-snippet: |
-      limit_req zone=login_limit;
-  # -- Path within the url structure
-  paths:
-  - "/managementportal/oauth/token"
-  - "/managementportal/login"
-  - "/managementportal/api/meta-token"
-  # -- Ingress Path type
-  pathType: ImplementationSpecific
-  # -- IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)
-  ingressClassName: nginx
-  # -- Hosts to accept requests from
-  hosts:
-    - localhost
-  tls:
-    # -- TLS Secret Name
-    secretName: radar-base-tls-managementportal-rate-limited
-
 resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little