Corrected podSelector for NetworkPolicy (#42)

Author: niels-hb

charts/relution/Chart.yaml

@@ -11,7 +11,7 @@ sources:
 
 type: application
 
-version: 2.7.1-1
+version: 3.0.0-1
 
 appVersion: "5.34.0"
 

charts/relution/ci/full-values.yaml

@@ -106,18 +106,17 @@ mariadb:
 
 networkPolicy:
   enabled: true
-  spec:
-    policyTypes:
-      - Ingress
-      - Egress
-    ingress:
-      - from:
-          - ipBlock:
-              cidr: "0.0.0.0/0"
-    egress:
-      - to:
-          - ipBlock:
-              cidr: "0.0.0.0/0"
+  policyTypes:
+    - Ingress
+    - Egress
+  ingress:
+    - from:
+        - ipBlock:
+            cidr: "0.0.0.0/0"
+  egress:
+    - to:
+        - ipBlock:
+            cidr: "0.0.0.0/0"
 
 s2s:
   enabled: true

charts/relution/templates/networkpolicy.yaml

@@ -6,5 +6,19 @@ metadata:
   labels:
     {{- include "relution.labels" . | nindent 4 }}
 spec:
-  {{- .Values.networkPolicy.spec | toYaml | nindent 2 -}}
+  podSelector:
+    matchLabels:
+      {{- include "relution.selectorLabels" . | nindent 6 }}
+  {{- with .Values.networkPolicy.egress }}
+  egress:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.networkPolicy.ingress }}
+  ingress:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.networkPolicy.policyTypes }}
+  policyTypes:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}

charts/relution/values.yaml

@@ -208,7 +208,9 @@ mariadb:
 
 networkPolicy:
   enabled: false
-  spec: {}
+  ingress: {}
+  egress: {}
+  policyTypes: []
 
 s2s:
   enabled: false