[stable/prometheus-pushgateway] Fix networkPolicy podSelector and ing…

…ress rule (#23053) * Fix `podSelector` by adding `release` label * Fix ingress rule by ensuring port is restricted Before it was: * Source: any, Port: `targetPort` * Source: `customSelectors`, Port: any Now it is: * Source: `customSelectors`, Port: `targetPort` and `allowAll` does not add an any/any rule anymore. Signed-off-by: Maxime Brunet <[email protected]>
helm · Jul 7, 2020 · 48dc1fc · 48dc1fc
1 parent ee67cf5
commit 48dc1fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/stable/prometheus-pushgateway/Chart.yaml b/stable/prometheus-pushgateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.0"
 description: A Helm chart for prometheus pushgateway
 name: prometheus-pushgateway
-version: 1.4.0
+version: 1.4.1
 home: https://github.com/prometheus/pushgateway
 sources:
 - https://github.com/prometheus/pushgateway

diff --git a/stable/prometheus-pushgateway/templates/networkpolicy.yaml b/stable/prometheus-pushgateway/templates/networkpolicy.yaml
@@ -15,13 +15,12 @@ spec:
   podSelector:
     matchLabels:
       app: {{ template "prometheus-pushgateway.name" .}}
+      release: {{ .Release.Name }}
   ingress:
     - ports:
       - port: {{ .Values.service.targetPort }}
 {{- if .Values.networkPolicy.customSelectors }}
-    - from:
+      from:
 {{ toYaml .Values.networkPolicy.customSelectors | indent 8 }}
-{{- else if .Values.networkPolicy.allowAll }}
-    - {}
 {{- end -}}
 {{- end -}}