openstack/openstack-helm-infra
Code Issues Proposed changes

Prometheus fix label mismatch for netpol

Browse Source 
Ensures that the label selectors match the labels actually applied to
the pods, to allow network policies to be applied correctly.

prometheus-kube-state-metrics deployment:
    application=kube-state-metrics

prometheus-process-exporter daemonset:
    application=process_exporter

Change-Id: I964bac9e85db28c8af926158f13c99883029ac84
This commit is contained in:
Sphicas, Phil (ps3910) 2019-10-15 15:42:19 -07:00 committed by Phil Sphicas
parent 0aad14a6f9
commit d607caf6e1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus-kube-state-metrics/templates/network_policy.yaml
View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. */}} limitations under the License. */}}
{{- if .Values.manifests.network_policy -}} {{- if .Values.manifests.network_policy -}}
{{- $netpol_opts := dict "envAll" . "name" "application" "label" "kube_state_metrics" -}} {{- $netpol_opts := dict "envAll" . "name" "application" "label" "kube-state-metrics" -}}
{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
{{- end -}} {{- end -}}

2
prometheus-kube-state-metrics/values.yaml
View File

@ -149,7 +149,7 @@ endpoints:
default: 10252 default: 10252
network_policy: network_policy:
kube_state_metrics: kube-state-metrics:
ingress: ingress:
- {} - {}
egress: egress:

2
prometheus-process-exporter/templates/network_policy.yaml
View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. */}} limitations under the License. */}}
{{- if .Values.manifests.network_policy -}} {{- if .Values.manifests.network_policy -}}
{{- $netpol_opts := dict "envAll" . "name" "application" "label" "prometheus_process_exporter" -}} {{- $netpol_opts := dict "envAll" . "name" "application" "label" "process_exporter" -}}
{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
{{- end -}} {{- end -}}

2
prometheus-process-exporter/values.yaml
View File

@ -149,7 +149,7 @@ endpoints:
default: 9256 default: 9256
network_policy: network_policy:
prometheus_process_exporter: process_exporter:
ingress: ingress:
- {} - {}
egress: egress: