Merge pull request #31032 from tmrts/fix/os-release-check

Automatic merge from submit-queue pkg/kubelet/rkt: skip empty lines in getOSReleaseInfo Follow-up of #31022

Merge pull request #31032 from tmrts/fix/os-release-check
4e571eaf · Kubernetes Submit Queue · GitHub · ad6eed40 · d992c0e7 · 4e571eaf
Commit 4e571eaf authored Aug 21, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

rkt.go pkg/kubelet/rkt/rkt.go +5 -0

No files found.
--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -2336,6 +2336,11 @@ func getOSReleaseInfo() (map[string]string, error) {
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
 		line := scanner.Text()
+		if len(strings.TrimSpace(line)) == 0 {
+			// Skips empty lines
+			continue
+		}
+
 		info := strings.SplitN(line, "=", 2)
 		if len(info) != 2 {
 			glog.Warningf("Unexpected entry in os-release %q", line)