Merge pull request #37220 from metal3d/fix-sysfs-on-none-device-37183

Automatic merge from submit-queue Check sysfs Type instead of Device Some distribution uses "none" device to mount "sysfs" type, so kube-proxy needs to list mount points and check "types" instead of "device". fixes #37183 ```release-note Change sysfs mountpoint tests from Device to Type to be able to find sysfs mountpoint on "none" device ```

Merge pull request #37220 from metal3d/fix-sysfs-on-none-device-37183
cc0406ca · Kubernetes Submit Queue · GitHub · 9a600f62 · 439a0313 · cc0406ca
Commit cc0406ca authored Nov 22, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

conntrack.go cmd/kube-proxy/app/conntrack.go +1 -1

No files found.
--- a/cmd/kube-proxy/app/conntrack.go
+++ b/cmd/kube-proxy/app/conntrack.go
@@ -98,7 +98,7 @@ func isSysFSWritable() (bool, error) {

 	for _, mountPoint := range mountPoints {
 		const sysfsDevice = "sysfs"
-		if mountPoint.Device != sysfsDevice {
+		if mountPoint.Type != sysfsDevice {
 			continue
 		}
 		// Check whether sysfs is 'rw'