ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 21 Packages Projects Releases Wiki Activity

Switch fluent-bit to use kubelet rather than kube-api

Browse Source
This commit is contained in:
Stefan Reimer 2021-03-07 12:38:53 +01:00
parent e991e7247a
commit 05b2edf089
5 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-logging/charts/fluent-bit/Chart.yaml
View File

@ -2,7 +2,7 @@ annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- add custom annotations on dashboards configmap - add custom annotations on dashboards configmap
apiVersion: v2 apiVersion: v2
appVersion: 1.7.1 appVersion: 1.7.2
description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems.
home: https://fluentbit.io/ home: https://fluentbit.io/
icon: https://fluentbit.io/assets/img/logo1-default.png icon: https://fluentbit.io/assets/img/logo1-default.png

2
charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl
View File

@ -13,6 +13,8 @@ securityContext:
dnsConfig: dnsConfig:
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
{{- end }} {{- end }}
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
securityContext: securityContext:

2
charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml
View File

@ -11,6 +11,8 @@ rules:
resources: resources:
- pods - pods
- namespaces - namespaces
- nodes
- nodes/proxy
verbs: verbs:
- get - get
- list - list

43
charts/kubezero-logging/fluent-bit.patch
View File

@ -1,19 +1,44 @@
Binary files charts/fluent-bit/.values.yaml.swp and charts/fluent-bit.zdt/.values.yaml.swp differ diff -tubNr charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml
diff -rtubN charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml
--- charts/fluent-bit/Chart.yaml 2021-02-23 14:58:39.000000000 +0100 --- charts/fluent-bit/Chart.yaml 2021-02-23 14:58:39.000000000 +0100
+++ charts/fluent-bit.zdt/Chart.yaml 2021-03-05 14:48:07.082648075 +0100 +++ charts/fluent-bit.zdt/Chart.yaml 2021-03-07 12:31:23.633414382 +0100
@@ -1,7 +1,7 @@ @@ -1,8 +1,8 @@
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- add custom annotations on dashboards configmap - add custom annotations on dashboards configmap
-apiVersion: v1 -apiVersion: v1
-appVersion: 1.7.1
+apiVersion: v2 +apiVersion: v2
appVersion: 1.7.1 +appVersion: 1.7.2
description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems.
home: https://fluentbit.io/ home: https://fluentbit.io/
diff -rtubN charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml icon: https://fluentbit.io/assets/img/logo1-default.png
diff -tubNr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates/_pod.tpl
--- charts/fluent-bit/templates/_pod.tpl 2021-02-23 14:58:39.000000000 +0100
+++ charts/fluent-bit.zdt/templates/_pod.tpl 2021-03-07 12:29:53.300076962 +0100
@@ -13,6 +13,8 @@
dnsConfig:
{{- toYaml . | nindent 2 }}
{{- end }}
+hostNetwork: true
+dnsPolicy: ClusterFirstWithHostNet
containers:
- name: {{ .Chart.Name }}
securityContext:
diff -tubNr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/templates/clusterrole.yaml
--- charts/fluent-bit/templates/clusterrole.yaml 2021-02-23 14:58:39.000000000 +0100
+++ charts/fluent-bit.zdt/templates/clusterrole.yaml 2021-03-07 12:22:43.336724185 +0100
@@ -11,6 +11,8 @@
resources:
- pods
- namespaces
+ - nodes
+ - nodes/proxy
verbs:
- get
- list
diff -tubNr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml
--- charts/fluent-bit/templates/tests/test-connection.yaml 2021-02-23 14:58:39.000000000 +0100 --- charts/fluent-bit/templates/tests/test-connection.yaml 2021-02-23 14:58:39.000000000 +0100
+++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml 2021-03-05 14:51:34.749324131 +0100 +++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml 2021-03-05 18:52:29.723311108 +0100
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }} +{{- if .Values.testFramework.enabled }}
apiVersion: v1 apiVersion: v1
@ -24,9 +49,9 @@ diff -rtubN charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent
{{- end }} {{- end }}
restartPolicy: Never restartPolicy: Never
+{{- end }} +{{- end }}
diff -rtubN charts/fluent-bit/values.yaml charts/fluent-bit.zdt/values.yaml diff -tubNr charts/fluent-bit/values.yaml charts/fluent-bit.zdt/values.yaml
--- charts/fluent-bit/values.yaml 2021-02-23 14:58:39.000000000 +0100 --- charts/fluent-bit/values.yaml 2021-02-23 14:58:39.000000000 +0100
+++ charts/fluent-bit.zdt/values.yaml 2021-03-05 14:50:40.652655018 +0100 +++ charts/fluent-bit.zdt/values.yaml 2021-03-05 18:52:29.723311108 +0100
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
# tag: # tag:

2
charts/kubezero-logging/values.yaml
View File

@ -258,6 +258,8 @@ fluent-bit:
Keep_Log Off Keep_Log Off
K8S-Logging.Parser Off K8S-Logging.Parser Off
K8S-Logging.Exclude Off K8S-Logging.Exclude Off
Use_Kubelet true
Kubelet_Port 10250
{{- if index .Values "config" "extraRecords" }} {{- if index .Values "config" "extraRecords" }}