kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4215 from justinsb/dial_down_logging_distro_detection 

nodeup: don't warn during distro detection
This commit is contained in:
k8s-ci-robot 2018-01-07 15:44:09 -08:00 committed by GitHub
parent d71c188233 5f729d49cb
commit 97d670cf52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nodeup/pkg/distros/identify.go
View File

@ -38,7 +38,6 @@ func FindDistribution(rootfs string) (Distribution, error) {
return DistributionXenial, nil
}
}
glog.Infof("could not determine OS from lsb-release info %q", string(lsbRelease))
} else if !os.IsNotExist(err) {
glog.Warningf("error reading /etc/lsb-release: %v", err)
}
@ -77,34 +76,39 @@ func FindDistribution(rootfs string) (Distribution, error) {
}
// CoreOS uses /usr/lib/os-release
osRelease, err := ioutil.ReadFile(path.Join(rootfs, "usr/lib/os-release"))
usrLibOsRelease, err := ioutil.ReadFile(path.Join(rootfs, "usr/lib/os-release"))
if err == nil {
for _, line := range strings.Split(string(osRelease), "\n") {
for _, line := range strings.Split(string(usrLibOsRelease), "\n") {
line = strings.TrimSpace(line)
if line == "ID=coreos" {
return DistributionCoreOS, nil
}
}
glog.Warningf("unhandled os-release info %q", string(osRelease))
glog.Warningf("unhandled os-release info %q", string(usrLibOsRelease))
} else if !os.IsNotExist(err) {
glog.Warningf("error reading /usr/lib/os-release: %v", err)
}
// ContainerOS uses /etc/os-release
{
osRelease, err := ioutil.ReadFile(path.Join(rootfs, "etc/os-release"))
if err == nil {
for _, line := range strings.Split(string(osRelease), "\n") {
line = strings.TrimSpace(line)
if line == "ID=cos" {
return DistributionContainerOS, nil
}
osRelease, err := ioutil.ReadFile(path.Join(rootfs, "etc/os-release"))
if err == nil {
for _, line := range strings.Split(string(osRelease), "\n") {
line = strings.TrimSpace(line)
if line == "ID=cos" {
return DistributionContainerOS, nil
}
glog.Warningf("unhandled /etc/os-release info %q", string(osRelease))
} else if !os.IsNotExist(err) {
glog.Warningf("error reading /etc/os-release: %v", err)
}
glog.Warningf("unhandled /etc/os-release info %q", string(osRelease))
} else if !os.IsNotExist(err) {
glog.Warningf("error reading /etc/os-release: %v", err)
}
glog.Warningf("could not determine distro")
glog.Warningf(" /etc/lsb-release: %q", string(lsbRelease))
glog.Warningf(" /etc/debian_version: %q", string(debianVersionBytes))
glog.Warningf(" /etc/redhat-release: %q", string(redhatRelease))
glog.Warningf(" /usr/lib/os-release: %q", string(usrLibOsRelease))
glog.Warningf(" /etc/os-release: %q", string(osRelease))
return "", fmt.Errorf("cannot identify distro")
}