more generic annotations & pod specific

This commit is contained in:
Jonny McCullagh 2023-01-09 12:04:21 +00:00
parent 156a447ba6
commit a2334ddb97
4 changed files with 18 additions and 7 deletions

View File

@ -20,8 +20,8 @@ spec:
annotations: annotations:
kompose.cmd: kompose convert kompose.cmd: kompose convert
kompose.version: 1.21.0 (992df58d8) kompose.version: 1.21.0 (992df58d8)
{{ if .Values.globals.logAnnotations }} {{ if .Values.globals.appServiceAnnotations }}
{{ toYaml .Values.globals.logAnnotations | indent 4 }} {{ toYaml .Values.globals.appServiceAnnotations | indent 4 }}
{{ end }} {{ end }}
creationTimestamp: null creationTimestamp: null
labels: labels:

View File

@ -20,8 +20,8 @@ spec:
annotations: annotations:
kompose.cmd: kompose convert kompose.cmd: kompose convert
kompose.version: 1.21.0 (992df58d8) kompose.version: 1.21.0 (992df58d8)
{{ if .Values.globals.logAnnotations }} {{ if .Values.globals.proxyServiceAnnotations }}
{{ toYaml .Values.globals.logAnnotations | indent 4 }} {{ toYaml .Values.globals.proxyServiceAnnotations | indent 4 }}
{{ end }} {{ end }}
creationTimestamp: null creationTimestamp: null
labels: labels:

View File

@ -21,8 +21,8 @@ spec:
annotations: annotations:
kompose.cmd: kompose convert kompose.cmd: kompose convert
kompose.version: 1.21.0 (992df58d8) kompose.version: 1.21.0 (992df58d8)
{{ if .Values.globals.logAnnotations }} {{ if .Values.globals.workerServiceAnnotations }}
{{ toYaml .Values.globals.logAnnotations | indent 4 }} {{ toYaml .Values.globals.workerServiceAnnotations | indent 4 }}
{{ end }} {{ end }}
creationTimestamp: null creationTimestamp: null
labels: labels:

View File

@ -22,12 +22,23 @@ serviceAccount:
podAnnotations: {} podAnnotations: {}
# logAnnotations: # appServiceAnnotations:
# co.elastic.logs/multiline.type: pattern # co.elastic.logs/multiline.type: pattern
# co.elastic.logs/multiline.pattern: '^[[:space:]]' # co.elastic.logs/multiline.pattern: '^[[:space:]]'
# co.elastic.logs/multiline.negate: false # co.elastic.logs/multiline.negate: false
# co.elastic.logs/multiline.match: after # co.elastic.logs/multiline.match: after
# workerServiceAnnotations:
# co.elastic.logs/multiline.type: pattern
# co.elastic.logs/multiline.pattern: '^[[:space:]]'
# co.elastic.logs/multiline.negate: false
# co.elastic.logs/multiline.match: after
# proxyServiceAnnotations:
# co.elastic.logs/module: nginx
# co.elastic.logs/fileset.stdout: access
# co.elastic.logs/fileset.stderr: error
podSecurityContext: podSecurityContext:
{} {}
# fsGroup: 2000 # fsGroup: 2000