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

Remove unnecessary docker mount

Browse Source
This commit is contained in:
Stefan Reimer 2021-03-07 12:47:06 +01:00
parent 05b2edf089
commit 9dc2881f15
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,9 +65,6 @@ containers:
{{- if eq .Values.kind "DaemonSet" }} {{- if eq .Values.kind "DaemonSet" }}
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
- name: etcmachineid - name: etcmachineid
mountPath: /etc/machine-id mountPath: /etc/machine-id
readOnly: true readOnly: true
@ -88,9 +85,6 @@ volumes:
- name: varlog - name: varlog
hostPath: hostPath:
path: /var/log path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: etcmachineid - name: etcmachineid
hostPath: hostPath:
path: /etc/machine-id path: /etc/machine-id

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

@ -1,6 +1,6 @@
diff -tubNr charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml diff -tubNr 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-07 12:31:23.633414382 +0100 +++ charts/fluent-bit.zdt/Chart.yaml 2021-03-07 12:32:34.360084252 +0100
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
@ -14,7 +14,7 @@ diff -tubNr charts/fluent-bit/Chart.yaml charts/fluent-bit.zdt/Chart.yaml
icon: https://fluentbit.io/assets/img/logo1-default.png icon: https://fluentbit.io/assets/img/logo1-default.png
diff -tubNr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates/_pod.tpl 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/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 +++ charts/fluent-bit.zdt/templates/_pod.tpl 2021-03-07 12:45:11.766785251 +0100
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
dnsConfig: dnsConfig:
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}
@ -24,9 +24,29 @@ diff -tubNr charts/fluent-bit/templates/_pod.tpl charts/fluent-bit.zdt/templates
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
securityContext: securityContext:
@@ -63,9 +65,6 @@
{{- if eq .Values.kind "DaemonSet" }}
- name: varlog
mountPath: /var/log
- - name: varlibdockercontainers
- mountPath: /var/lib/docker/containers
- readOnly: true
- name: etcmachineid
mountPath: /etc/machine-id
readOnly: true
@@ -86,9 +85,6 @@
- name: varlog
hostPath:
path: /var/log
- - name: varlibdockercontainers
- hostPath:
- path: /var/lib/docker/containers
- name: etcmachineid
hostPath:
path: /etc/machine-id
diff -tubNr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/templates/clusterrole.yaml 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/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 +++ charts/fluent-bit.zdt/templates/clusterrole.yaml 2021-03-07 12:32:34.363417586 +0100
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
resources: resources:
- pods - pods
@ -38,7 +58,7 @@ diff -tubNr charts/fluent-bit/templates/clusterrole.yaml charts/fluent-bit.zdt/t
- list - list
diff -tubNr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent-bit.zdt/templates/tests/test-connection.yaml 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 18:52:29.723311108 +0100 +++ charts/fluent-bit.zdt/templates/tests/test-connection.yaml 2021-03-07 12:32:34.363417586 +0100
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }} +{{- if .Values.testFramework.enabled }}
apiVersion: v1 apiVersion: v1
@ -51,7 +71,7 @@ diff -tubNr charts/fluent-bit/templates/tests/test-connection.yaml charts/fluent
+{{- end }} +{{- end }}
diff -tubNr 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 18:52:29.723311108 +0100 +++ charts/fluent-bit.zdt/values.yaml 2021-03-07 12:32:34.363417586 +0100
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
# tag: # tag: