Skip to content

Commit eceef9c

Browse files
DrPsychickDrPsychick
committed
fix: rspamd, replace bitnami common
1 parent e1b57cf commit eceef9c

File tree

5 files changed

+45
-45
lines changed

5 files changed

+45
-45
lines changed

‎charts/mailu/templates/rspamd/configmap.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ apiVersion: v1
33
kind: ConfigMap
44
metadata:
55
name: {{ printf "%s-rspamd-override" (include "mailu.fullname" .) }}
6-
namespace: {{ include "common.names.namespace" . | quote }}
7-
labels: {{- include "common.labels.standard" . | nindent 4 }}
6+
namespace: {{ include "mailu.names.namespace" . | quote }}
7+
labels: {{- include "mailu.labels.standard" . | nindent 4 }}
88
app.kubernetes.io/component: rspamd
99
{{- if .Values.commonLabels }}
10-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
10+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1111
{{- end }}
1212
{{- if .Values.commonAnnotations }}
13-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
13+
annotations: {{- include "mailu.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
1414
{{- end }}
1515
{{- with .Values.rspamd.overrides }}
1616
data:

‎charts/mailu/templates/rspamd/deployment.yaml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
{{- if .Values.rspamd.enabled }}
3-
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
3+
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
name: {{ printf "%s-rspamd" (include "mailu.fullname" .) }}
7-
namespace: {{ include "common.names.namespace" . | quote }}
8-
labels: {{- include "common.labels.standard" . | nindent 4 }}
7+
namespace: {{ include "mailu.names.namespace" . | quote }}
8+
labels: {{- include "mailu.labels.standard" . | nindent 4 }}
99
app.kubernetes.io/component: rspamd
1010
{{- if .Values.commonLabels }}
11-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
11+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1212
{{- end }}
1313
{{- if .Values.commonAnnotations }}
14-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
14+
annotations: {{- include "mailu.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
1515
{{- end }}
1616
spec:
1717
replicas: 1
@@ -20,31 +20,31 @@ spec:
2020
{{- end }}
2121
revisionHistoryLimit: {{ .Values.rspamd.revisionHistoryLimit }}
2222
selector:
23-
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
23+
matchLabels: {{- include "mailu.labels.matchLabels" . | nindent 6 }}
2424
app.kubernetes.io/component: rspamd
2525
template:
2626
metadata:
27-
labels: {{- include "common.labels.standard" . | nindent 8 }}
27+
labels: {{- include "mailu.labels.standard" . | nindent 8 }}
2828
app.kubernetes.io/component: rspamd
2929
{{- if .Values.rspamd.podLabels }}
30-
{{- include "common.tplvalues.render" (dict "value" .Values.rspamd.podLabels "context" $) | nindent 8 }}
30+
{{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.podLabels "context" $) | nindent 8 }}
3131
{{- end }}
3232
{{- if .Values.rspamd.podAnnotations }}
33-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.podAnnotations "context" $) | nindent 8 }}
33+
annotations: {{- include "mailu.tplvalues.render" ( dict "value" .Values.rspamd.podAnnotations "context" $) | nindent 8 }}
3434
{{- end }}
3535
spec:
36-
{{- include "common.images.pullSecrets" (dict "images" (list .Values.rspamd.image) "global" .Values.global) | nindent 6 }}
36+
{{- include "mailu.images.renderPullSecrets" (dict "images" (list .Values.rspamd.image) "context" $) | nindent 6 }}
3737
{{- if .Values.rspamd.hostAliases }}
38-
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.hostAliases "context" $) | nindent 8 }}
38+
hostAliases: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.hostAliases "context" $) | nindent 8 }}
3939
{{- end }}
4040
{{- if .Values.rspamd.nodeSelector }}
41-
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.nodeSelector "context" $) | nindent 8 }}
41+
nodeSelector: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.nodeSelector "context" $) | nindent 8 }}
4242
{{- end }}
4343
{{- if .Values.rspamd.affinity }}
44-
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.affinity "context" $) | nindent 8 }}
44+
affinity: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.affinity "context" $) | nindent 8 }}
4545
{{- end }}
4646
{{- if .Values.rspamd.tolerations }}
47-
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.tolerations "context" $) | nindent 8 }}
47+
tolerations: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.tolerations "context" $) | nindent 8 }}
4848
{{- end }}
4949
{{- if .Values.rspamd.priorityClassName }}
5050
priorityClassName: {{ .Values.rspamd.priorityClassName | quote }}
@@ -53,13 +53,13 @@ spec:
5353
schedulerName: {{ .Values.rspamd.schedulerName | quote }}
5454
{{- end }}
5555
{{- if .Values.rspamd.topologySpreadConstraints }}
56-
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.topologySpreadConstraints "context" $) | nindent 8 }}
56+
topologySpreadConstraints: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.topologySpreadConstraints "context" $) | nindent 8 }}
5757
{{- end }}
5858
{{- if .Values.rspamd.terminationGracePeriodSeconds }}
5959
terminationGracePeriodSeconds: {{ .Values.rspamd.terminationGracePeriodSeconds }}
6060
{{- end }}
6161
{{- if .Values.rspamd.initContainers }}
62-
initContainers: {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.initContainers "context" $) | nindent 8 }}
62+
initContainers: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.initContainers "context" $) | nindent 8 }}
6363
{{- end }}
6464
{{- if .Values.rspamd.podSecurityContext.enabled }}
6565
securityContext: {{- omit .Values.rspamd.podSecurityContext "enabled" | toYaml | nindent 8 }}
@@ -84,25 +84,25 @@ spec:
8484
mountPath: /overrides
8585
{{- end }}
8686
{{- if .Values.rspamd.extraVolumeMounts }}
87-
{{- include "common.tplvalues.render" (dict "value" .Values.rspamd.extraVolumeMounts "context" $) | nindent 12 }}
87+
{{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.extraVolumeMounts "context" $) | nindent 12 }}
8888
{{- end }}
8989
env:
9090
- name: LOG_LEVEL
9191
value: {{ default .Values.logLevel .Values.rspamd.logLevel }}
9292
{{- tpl (include "mailu.envvars.secrets" .) $ | nindent 12 }}
9393
{{- if .Values.rspamd.extraEnvVars }}
94-
{{- include "common.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVars "context" $) | nindent 12 }}
94+
{{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVars "context" $) | nindent 12 }}
9595
{{- end }}
9696
envFrom:
9797
- configMapRef:
9898
name: {{ printf "%s-envvars" (include "mailu.fullname" .) }}
9999
{{- if .Values.rspamd.extraEnvVarsCM }}
100100
- configMapRef:
101-
name: {{ include "common.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVarsCM "context" $) }}
101+
name: {{ include "mailu.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVarsCM "context" $) }}
102102
{{- end }}
103103
{{- if .Values.rspamd.extraEnvVarsSecret }}
104104
- secretRef:
105-
name: {{ include "common.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVarsSecret "context" $) }}
105+
name: {{ include "mailu.tplvalues.render" (dict "value" .Values.rspamd.extraEnvVarsSecret "context" $) }}
106106
{{- end }}
107107
ports:
108108
- name: rspamd
@@ -115,19 +115,19 @@ spec:
115115
resources: {{- toYaml .Values.rspamd.resources | nindent 12 }}
116116
{{- end }}
117117
{{- if .Values.rspamd.startupProbe.enabled }}
118-
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.startupProbe "enabled") "context" $) | nindent 12 }}
118+
startupProbe: {{- include "mailu.tplvalues.render" (dict "value" (omit .Values.rspamd.startupProbe "enabled") "context" $) | nindent 12 }}
119119
httpGet:
120120
path: /
121121
port: rspamd-http
122122
{{- end }}
123123
{{- if .Values.rspamd.livenessProbe.enabled }}
124-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.livenessProbe "enabled") "context" $) | nindent 12 }}
124+
livenessProbe: {{- include "mailu.tplvalues.render" (dict "value" (omit .Values.rspamd.livenessProbe "enabled") "context" $) | nindent 12 }}
125125
httpGet:
126126
path: /
127127
port: rspamd-http
128128
{{- end }}
129129
{{- if .Values.rspamd.readinessProbe.enabled }}
130-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.readinessProbe "enabled") "context" $) | nindent 12 }}
130+
readinessProbe: {{- include "mailu.tplvalues.render" (dict "value" (omit .Values.rspamd.readinessProbe "enabled") "context" $) | nindent 12 }}
131131
httpGet:
132132
path: /
133133
port: rspamd-http
@@ -145,6 +145,6 @@ spec:
145145
name: {{ printf "%s-rspamd-override" (include "mailu.fullname" .) }}
146146
{{- end }}
147147
{{- if .Values.rspamd.extraVolumes }}
148-
{{- include "common.tplvalues.render" (dict "value" .Values.rspamd.extraVolumes "context" $) | nindent 8 }}
148+
{{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.extraVolumes "context" $) | nindent 8 }}
149149
{{- end }}
150150
{{ end }}

‎charts/mailu/templates/rspamd/pvc.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ kind: PersistentVolumeClaim
55
apiVersion: v1
66
metadata:
77
name: {{ include "mailu.rspamd.claimName" . }}
8-
namespace: {{ include "common.names.namespace" . | quote }}
9-
labels: {{- include "common.labels.standard" . | nindent 4 }}
8+
namespace: {{ include "mailu.names.namespace" . | quote }}
9+
labels: {{- include "mailu.labels.standard" . | nindent 4 }}
1010
app.kubernetes.io/component: rspamd
1111
{{- if .Values.commonLabels }}
12-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
12+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- end }}
1414
{{- if or .Values.rspamd.persistence.annotations .Values.commonAnnotations }}
1515
annotations:
1616
{{- if .Values.rspamd.persistence.annotations }}
17-
{{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.persistence.annotations "context" $ ) | nindent 4 }}
17+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.rspamd.persistence.annotations "context" $ ) | nindent 4 }}
1818
{{- end }}
1919
{{- if .Values.commonAnnotations }}
20-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
20+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2121
{{- end }}
2222
{{- end }}
2323
spec:

‎charts/mailu/templates/rspamd/service.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
name: {{ include "mailu.rspamd.serviceName" . }}
7-
namespace: {{ include "common.names.namespace" . | quote }}
8-
labels: {{- include "common.labels.standard" . | nindent 4 }}
7+
namespace: {{ include "mailu.names.namespace" . | quote }}
8+
labels: {{- include "mailu.labels.standard" . | nindent 4 }}
99
app.kubernetes.io/component: rspamd
1010
{{- if .Values.commonLabels }}
11-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
11+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1212
{{- end }}
1313
{{- if .Values.rspamd.service.annotations }}
14-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.service.annotations "context" $) | nindent 4 }}
14+
annotations: {{- include "mailu.tplvalues.render" ( dict "value" .Values.rspamd.service.annotations "context" $) | nindent 4 }}
1515
{{- end }}
1616
spec:
17-
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
17+
selector: {{- include "mailu.labels.matchLabels" . | nindent 4 }}
1818
app.kubernetes.io/component: rspamd
1919
ports:
2020
- name: rspamd

‎charts/mailu/templates/rspamd/servicemonitor.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:
55
name: {{ include "mailu.rspamd.serviceName" . }}
6-
namespace: {{ include "common.names.namespace" . | quote }}
7-
labels: {{- include "common.labels.standard" . | nindent 4 }}
6+
namespace: {{ include "mailu.names.namespace" . | quote }}
7+
labels: {{- include "mailu.labels.standard" . | nindent 4 }}
88
app.kubernetes.io/component: rspamd
99
{{- if .Values.commonLabels }}
10-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
10+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1111
{{- end }}
1212
{{- if .Values.rspamd.serviceMonitor.annotations }}
13-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.serviceMonitor.annotations "context" $) | nindent 4 }}
13+
annotations: {{- include "mailu.tplvalues.render" ( dict "value" .Values.rspamd.serviceMonitor.annotations "context" $) | nindent 4 }}
1414
{{- end }}
1515
spec:
1616
selector:
1717
matchLabels:
18-
{{- include "common.labels.matchLabels" . | nindent 6 }}
18+
{{- include "mailu.labels.matchLabels" . | nindent 6 }}
1919
app.kubernetes.io/component: rspamd
2020
namespaceSelector:
2121
matchNames:
22-
- {{ include "common.names.namespace" . | quote }}
22+
- {{ include "mailu.names.namespace" . | quote }}
2323
endpoints:
2424
- port: rspamd-http
2525
path: /metrics
@@ -35,7 +35,7 @@ spec:
3535
- action: labeldrop
3636
regex: "__param_password"
3737
{{ if .Values.rspamd.serviceMonitor.relabelings }}
38-
{{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.serviceMonitor.relabelings "context" $) | nindent 8 }}
38+
{{- include "mailu.tplvalues.render" ( dict "value" .Values.rspamd.serviceMonitor.relabelings "context" $) | nindent 8 }}
3939
{{- end }}
4040
{{- if .Values.rspamd.serviceMonitor.metricRelabelings }}
4141
metricRelabelings: {{- tpl (toYaml .Values.rspamd.serviceMonitor.metricRelabelings | nindent 6) . }}

0 commit comments

Comments
 (0)