panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add recommendation for prometheus exporter (#144)

Browse Source
This commit is contained in:
kfox1111
2023-12-19 11:38:20 +00:00
committed by GitHub
parent 6997d6a904
commit 33cacd2ee8
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml
+1 -1
View File
@@ -95,7 +95,7 @@ spec:
readOnly: false
resources:
{{- toYaml .Values.insecureScheme.nginx.resources | nindent 12 }}
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
- name: nginx-exporter
securityContext:
{{- include "spire-lib.securitycontext" . | nindent 12 }}
charts/spire/charts/spire-agent/templates/configmap.yaml
+1 -1
View File
@@ -86,7 +86,7 @@ health_checks:
live_path: "/live"
ready_path: "/ready"
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
telemetry:
- Prometheus:
- host: "0.0.0.0"
charts/spire/charts/spire-agent/templates/daemonset.yaml
+1 -1
View File
@@ -86,7 +86,7 @@ spec:
ports:
- containerPort: {{ .Values.healthChecks.port }}
name: healthz
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
- containerPort: {{ .Values.telemetry.prometheus.port }}
name: prom
{{- end }}
charts/spire/charts/spire-server/templates/configmap.yaml
+1 -1
View File
@@ -242,7 +242,7 @@ health_checks:
live_path: "/live"
ready_path: "/ready"
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
telemetry:
- Prometheus:
- host: "0.0.0.0"
charts/spire/charts/spire-server/templates/statefulset.yaml
+2 -2
View File
@@ -125,7 +125,7 @@ spec:
protocol: TCP
{{- end }}
{{- end }}
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
- containerPort: 9988
name: prom
{{- end }}
@@ -198,7 +198,7 @@ spec:
protocol: TCP
- containerPort: 8083
name: healthz
{{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
{{- if or (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) (and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "prometheus" true .Values.global)) }}
- containerPort: 8082
name: prom2
{{- end }}