Skip to content

Commit

Permalink
possibility to define the CA configmap for the lokistack storage
Browse files Browse the repository at this point in the history
  • Loading branch information
tjungbauer committed Oct 28, 2024
1 parent da25daf commit 727a4b9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 3 additions & 1 deletion charts/helper-lokistack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: helper-lokistack
description: The only purpose of this helper chart is to provide a template for the LokiStack Custom Resource, so it must not be re-defined for multiple services.
version: 1.0.10
version: 1.0.11
home: https://github.com/tjungbauer/helm-charts/tree/main/charts/helper-lokistack
icon: https://github.com/tjungbauer/helm-charts/raw/gh-pages/images/loki.png
maintainers:
Expand Down Expand Up @@ -38,3 +38,5 @@ annotations:
description: using global template to build tolerations
- kind: fixed
description: changed default schema
- kind: added
description: possibility to configure the CA configmap
4 changes: 2 additions & 2 deletions charts/helper-lokistack/templates/LokiStack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ spec:
size: {{ .storage.size | default "1x.extra-small" | quote }}
storage:
tls:
caKey: service-ca.crt
caName: openshift-service-ca.crt
caKey: {{ .storage.tls_caKey | default "service-ca.crt" }}
caName: {{ .storage.tls_caName | default "openshift-service-ca.crt" }}
{{- if .storage.schemas }}
schemas:
{{- range .storage.schemas }}
Expand Down
10 changes: 9 additions & 1 deletion charts/helper-lokistack/values_example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# -- Enable or disable LokiStack configuration
# @default -- false
enabled: false
enabled: true

# -- Name of the LokiStack object
name: logging-loki
Expand Down Expand Up @@ -108,6 +108,14 @@ storage:
# @default -- s3
type: s3

# -- Key of Configmap that contains the CAs
# @default -- service-ca.crt
tls_caKey: service-ca.crt

# -- Name of Configmap that contains the CAs
# @default -- openshift-service-ca.crt
tls_caName: openshift-service-ca.crt

# Schemas for reading and writing logs.
schemas:
# -- Version for writing and reading logs.
Expand Down

0 comments on commit 727a4b9

Please sign in to comment.