Merge pull request #108 from RADAR-base/mp-hotfix

Fixed MP ingress and network policy
RADAR-base · Dec 5, 2023 · 8dd1ed6 · 8dd1ed6
2 parents d869509 + 586fef3
commit 8dd1ed6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 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.0
+version: 1.1.1
 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.0](https://img.shields.io/badge/Version-1.1.0-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.1](https://img.shields.io/badge/Version-1.1.1-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.
 

diff --git a/charts/management-portal/templates/ingress-rate-limited.yaml b/charts/management-portal/templates/ingress-rate-limited.yaml
@@ -11,7 +11,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ $fullName }}-rate-limited
   labels:
 {{ include "management-portal.labels" . | indent 4 }}
   {{- with .Values.ingress_rate_limited.annotations }}

diff --git a/charts/management-portal/templates/networkpolicy.yaml b/charts/management-portal/templates/networkpolicy.yaml
@@ -7,6 +7,7 @@ metadata:
 {{ include "management-portal.labels" . | indent 4 }}
 spec:
   podSelector:
-{{ include "management-portal.labels" . | indent 4 }}
+    matchLabels:
+{{ include "management-portal.labels" . | indent 6 }}
     {{- tpl (toYaml .Values.networkpolicy) .  | nindent 2 }}
 {{- end -}}