Skip to content

Commit df4f02e

Browse files
committed
Specify init container resources for fluent-operator deployment
Signed-off-by: Gyorgy Nadaban <[email protected]>
1 parent 251932e commit df4f02e

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

charts/fluent-operator/templates/fluent-operator-deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ spec:
4040
- '-c'
4141
- set -ex;
4242
echo CONTAINER_ROOT_DIR=$(docker info -f '{{`{{.DockerRootDir}}`}}' 2> /dev/null) > /fluent-operator/fluent-bit.env
43+
resources:
44+
{{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
4345
volumeMounts:
4446
- name: env
4547
mountPath: /fluent-operator
@@ -58,6 +60,8 @@ spec:
5860
- '-c'
5961
- set -ex;
6062
echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.containerd }} > /fluent-operator/fluent-bit.env
63+
resources:
64+
{{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
6165
volumeMounts:
6266
- name: env
6367
mountPath: /fluent-operator
@@ -73,6 +77,8 @@ spec:
7377
- '-c'
7478
- set -ex;
7579
echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.crio }} > /fluent-operator/fluent-bit.env
80+
resources:
81+
{{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
7682
volumeMounts:
7783
- name: env
7884
mountPath: /fluent-operator

charts/fluent-operator/values.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ operator:
1414
initcontainer:
1515
repository: "docker"
1616
tag: "20.10"
17+
18+
resources:
19+
limits:
20+
cpu: 100m
21+
memory: 64Mi
22+
requests:
23+
cpu: 50m
24+
memory: 64Mi
1725
container:
1826
repository: "kubesphere/fluent-operator"
1927
tag: "latest"
@@ -108,8 +116,8 @@ fluentbit:
108116
# nodeSelector configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/user-guide/node-selection/
109117
nodeSelector: {}
110118
# Node tolerations applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
111-
tolerations:
112-
- operator: Exists
119+
tolerations:
120+
- operator: Exists
113121
# Priority Class applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
114122
priorityClassName: ""
115123
# Environment variables that can be passed to fluentbit pods
@@ -224,9 +232,9 @@ fluentbit:
224232
kubeedge:
225233
enable: false
226234
prometheusRemoteWrite:
227-
# Change the host to the address of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
235+
# Change the host to the address of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
228236
host: "<cloud-prometheus-service-host>"
229-
# Change the port to the port of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
237+
# Change the port to the port of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
230238
port: "<cloud-prometheus-service-port>"
231239

232240
fluentd:

0 commit comments

Comments
 (0)