UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit b1e951a2 authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch 'promtail-mtls' into 'master'

Added bits for mTLS with Promtail

Closes platform-one/big-bang/apps/sandbox/promtail#10

See merge request platform-one/big-bang/bigbang!2065
parents 15c4b91e 8a66224a
No related branches found
No related tags found
1 merge request!2065Added bits for mTLS with Promtail
Pipeline #973152 passed with warnings
......@@ -19,6 +19,15 @@ istio:
serviceMonitor:
enabled: {{ .Values.monitoring.enabled }}
# conditional passes only for default istio: enabled, mTLS: SCRICT
{{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.promtail.values) "STRICT") }}
scheme: https
tlsConfig:
caFile: /etc/prom-certs/root-cert.pem
certFile: /etc/prom-certs/cert-chain.pem
keyFile: /etc/prom-certs/key.pem
insecureSkipVerify: true # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
{{- end }}
monitoring:
enabled: {{ .Values.monitoring.enabled }}
......
......@@ -492,7 +492,7 @@ promtail:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/promtail.git
path: "./chart"
tag: "6.2.2-bb.1"
tag: "6.2.2-bb.2"
# -- Flux reconciliation overrides specifically for the Promtail Package
flux: {}
......@@ -521,7 +521,7 @@ loki:
# -- S3 compatible endpoint to use for connection information.
# examples: "https://s3.amazonaws.com" "https://s3.us-gov-west-1.amazonaws.com" "http://minio.minio.svc.cluster.local:9000"
endpoint: ""
# -- S3 compatible region to use for connection information.
region: ""
......
......@@ -154,7 +154,7 @@ To start using Big Bang, you will need to create your own Big Bang environment t
| promtail.enabled | bool | `false` | Toggle deployment of Promtail. |
| promtail.git.repo | string | `"https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/promtail.git"` | |
| promtail.git.path | string | `"./chart"` | |
| promtail.git.tag | string | `"6.2.2-bb.1"` | |
| promtail.git.tag | string | `"6.2.2-bb.2"` | |
| promtail.flux | object | `{}` | Flux reconciliation overrides specifically for the Promtail Package |
| promtail.values | object | `{}` | Values to passthrough to the promtail chart: https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit.git |
| promtail.postRenderers | list | `[]` | Post Renderers. See docs/postrenders.md |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment