Skip to content

Commit 989572c

Browse files
authored
update: support seperate pod annotataions (#144)
1 parent e2d0dbc commit 989572c

11 files changed

+29
-12
lines changed

charts/openobserve/templates/alertmanager-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
template:
2121
metadata:
2222
annotations:
23-
{{- with .Values.podAnnotations }}
23+
{{- with .Values.podAnnotations.alertmanager }}
2424
{{- toYaml . | nindent 8 }}
2525
{{- end }}
2626
checksum/specific-config: {{ include (print $.Template.BasePath "/alertmanager-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/alertquerier-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
template:
2121
metadata:
2222
annotations:
23-
{{- with .Values.podAnnotations }}
23+
{{- with .Values.podAnnotations.alertquerier }}
2424
{{- toYaml . | nindent 8 }}
2525
{{- end }}
2626
checksum/specific-config: {{ include (print $.Template.BasePath "/alertquerier-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/compactor-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
template:
1717
metadata:
1818
annotations:
19-
{{- with .Values.podAnnotations }}
19+
{{- with .Values.podAnnotations.compactor }}
2020
{{- toYaml . | nindent 8 }}
2121
{{- end }}
2222
checksum/specific-config: {{ include (print $.Template.BasePath "/compactor-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/dex-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
{{- include "openobserve.selectorLabels" . | nindent 6 }}
1616
template:
1717
metadata:
18-
{{- with .Values.enterprise.dex.podAnnotations }}
18+
{{- with .Values.podAnnotations.dex }}
1919
annotations:
2020
{{- toYaml . | nindent 8 }}
2121
{{- end }}

charts/openobserve/templates/ingester-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
template:
2828
metadata:
2929
annotations:
30-
{{- with .Values.podAnnotations }}
30+
{{- with .Values.podAnnotations.ingester }}
3131
{{- toYaml . | nindent 8 }}
3232
{{- end }}
3333
checksum/specific-config: {{ include (print $.Template.BasePath "/ingester-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/querier-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
template:
2121
metadata:
2222
annotations:
23-
{{- with .Values.podAnnotations }}
23+
{{- with .Values.podAnnotations.querier }}
2424
{{- toYaml . | nindent 8 }}
2525
{{- end }}
2626
checksum/specific-config: {{ include (print $.Template.BasePath "/querier-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/reportserver-delpoyment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
template:
1717
metadata:
1818
annotations:
19-
{{- with .Values.podAnnotations }}
19+
{{- with .Values.podAnnotations.reportserver }}
2020
{{- toYaml . | nindent 8 }}
2121
{{- end }}
2222
checksum/specific-config: {{ include (print $.Template.BasePath "/reportserver-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/router-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
template:
1717
metadata:
1818
annotations:
19-
{{- with .Values.podAnnotations }}
19+
{{- with .Values.podAnnotations.router }}
2020
{{- toYaml . | nindent 8 }}
2121
{{- end }}
2222
checksum/specific-config: {{ include (print $.Template.BasePath "/router-configmap.yaml") . | sha256sum }}

charts/openobserve/templates/zplane-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
role: zplane
1515
template:
1616
metadata:
17-
{{- with .Values.podAnnotations }}
17+
{{- with .Values.podAnnotations.zplane }}
1818
annotations:
1919
{{- toYaml . | nindent 8 }}
2020
{{- end }}

charts/openobserve/test_values_external_secret.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,16 @@ serviceAccount:
3434
# If not set and create is true, a name is generated using the fullname template
3535
name: ""
3636

37-
podAnnotations: {}
37+
podAnnotations:
38+
ingester: {}
39+
querier: {}
40+
compactor: {}
41+
router: {}
42+
alertmanager: {}
43+
dex: {}
44+
reportserver: {}
45+
alertquerier: {}
46+
zplane: {}
3847

3948
labels: {}
4049

0 commit comments

Comments
 (0)