easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #844 from paulfantom/hostpid

Browse Source 
node-exporter: do not mount /proc as it is covered by hostPID
This commit is contained in:
Frederic Branczyk
2020-12-31 12:16:39 +01:00
committed by GitHub
parent 06d7df8075 4f306fc3ff
commit 2984ca585c
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
View File

@@ -68,7 +68,6 @@
image: $._config.imageRepos.nodeExporter + ':' + $._config.versions.nodeExporter, image: $._config.imageRepos.nodeExporter + ':' + $._config.versions.nodeExporter,
args: [ args: [
'--web.listen-address=' + std.join(':', [$._config.nodeExporter.listenAddress, std.toString($._config.nodeExporter.port)]), '--web.listen-address=' + std.join(':', [$._config.nodeExporter.listenAddress, std.toString($._config.nodeExporter.port)]),
'--path.procfs=/host/proc',
'--path.sysfs=/host/sys', '--path.sysfs=/host/sys',
'--path.rootfs=/host/root', '--path.rootfs=/host/root',
'--no-collector.wifi', '--no-collector.wifi',
@@ -76,7 +75,6 @@
'--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)', '--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)',
], ],
volumeMounts: [ volumeMounts: [
{ name: 'proc', mountPath: '/host/proc', mountPropagation: 'HostToContainer', readOnly: true },
{ name: 'sys', mountPath: '/host/sys', mountPropagation: 'HostToContainer', readOnly: true }, { name: 'sys', mountPath: '/host/sys', mountPropagation: 'HostToContainer', readOnly: true },
{ name: 'root', mountPath: '/host/root', mountPropagation: 'HostToContainer', readOnly: true }, { name: 'root', mountPath: '/host/root', mountPropagation: 'HostToContainer', readOnly: true },
], ],
@@ -137,7 +135,6 @@
}], }],
containers: [nodeExporter, proxy], containers: [nodeExporter, proxy],
volumes: [ volumes: [
{ name: 'proc', hostPath: { path: '/proc' } },
{ name: 'sys', hostPath: { path: '/sys' } }, { name: 'sys', hostPath: { path: '/sys' } },
{ name: 'root', hostPath: { path: '/' } }, { name: 'root', hostPath: { path: '/' } },
], ],

8
manifests/node-exporter-daemonset.yaml
View File

@@ -25,7 +25,6 @@ spec:
containers: containers:
- args: - args:
- --web.listen-address=127.0.0.1:9100 - --web.listen-address=127.0.0.1:9100
- --path.procfs=/host/proc
- --path.sysfs=/host/sys - --path.sysfs=/host/sys
- --path.rootfs=/host/root - --path.rootfs=/host/root
- --no-collector.wifi - --no-collector.wifi
@@ -41,10 +40,6 @@ spec:
cpu: 102m cpu: 102m
memory: 180Mi memory: 180Mi
volumeMounts: volumeMounts:
- mountPath: /host/proc
mountPropagation: HostToContainer
name: proc
readOnly: true
- mountPath: /host/sys - mountPath: /host/sys
mountPropagation: HostToContainer mountPropagation: HostToContainer
name: sys name: sys
@@ -91,9 +86,6 @@ spec:
tolerations: tolerations:
- operator: Exists - operator: Exists
volumes: volumes:
- hostPath:
path: /proc
name: proc
- hostPath: - hostPath:
path: /sys path: /sys
name: sys name: sys