github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Automatic merge from submit-queue

pkg/kubelet/rkt: skip empty lines in getOSReleaseInfo

Follow-up of #31022
This commit is contained in:
Kubernetes Submit Queue 2016-08-21 02:29:33 -07:00 committed by GitHub
commit 4e571eafab
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/rkt/rkt.go
View File

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