From dfbb6fb6bbb9831c75a3c95cb348f1f3ea8e5760 Mon Sep 17 00:00:00 2001
From: Marek Counts <mcounts@suse.com>
Date: Thu, 29 Aug 2019 19:29:54 +0000
Subject: [PATCH] replaced logs in validators to be warnings

Originally kubeadm used klot in the validators to log
These logs are converted to warnings and klog was removed.
---
 cmd/kubeadm/app/util/system/BUILD                | 1 -
 cmd/kubeadm/app/util/system/kernel_validator.go  | 8 +-------
 cmd/kubeadm/app/util/system/package_validator.go | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/cmd/kubeadm/app/util/system/BUILD b/cmd/kubeadm/app/util/system/BUILD
index f47bca5eebe..5a0d8a07473 100644
--- a/cmd/kubeadm/app/util/system/BUILD
+++ b/cmd/kubeadm/app/util/system/BUILD
@@ -26,7 +26,6 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
         "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 
diff --git a/cmd/kubeadm/app/util/system/kernel_validator.go b/cmd/kubeadm/app/util/system/kernel_validator.go
index c63c4de21b8..153ca633aca 100644
--- a/cmd/kubeadm/app/util/system/kernel_validator.go
+++ b/cmd/kubeadm/app/util/system/kernel_validator.go
@@ -32,7 +32,6 @@ import (
 	"github.com/pkg/errors"
 
 	errorsutil "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/klog"
 )
 
 var _ Validator = &KernelValidator{}
@@ -255,12 +254,7 @@ func (k *KernelValidator) parseKernelConfig(r io.Reader) (map[string]kConfigOpti
 			continue
 		}
 		fields := strings.Split(line, "=")
-		if len(fields) != 2 {
-			klog.Errorf("Unexpected fields number in config %q", line)
-			continue
-		}
-		config[fields[0]] = kConfigOption(fields[1])
+		config[fields[0]] = kConfigOption(fields[1][0])
 	}
 	return config, nil
-
 }
diff --git a/cmd/kubeadm/app/util/system/package_validator.go b/cmd/kubeadm/app/util/system/package_validator.go
index 18fb9777eef..35a8e4fd170 100644
--- a/cmd/kubeadm/app/util/system/package_validator.go
+++ b/cmd/kubeadm/app/util/system/package_validator.go
@@ -26,7 +26,6 @@ import (
 	"github.com/pkg/errors"
 
 	errorsutil "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/klog"
 )
 
 // semVerDotsCount is the number of dots in a valid semantic version.
@@ -127,7 +126,6 @@ func (validator *packageValidator) validate(packageSpecs []PackageSpec, manager
 		// Get the version of the package on the running machine.
 		version, err := manager.getPackageVersion(packageName)
 		if err != nil {
-			klog.V(1).Infof("Failed to get the version for the package %q: %s\n", packageName, err)
 			errs = append(errs, err)
 			validator.reporter.Report(nameWithVerRange, "not installed", bad)
 			continue
@@ -145,7 +143,6 @@ func (validator *packageValidator) validate(packageSpecs []PackageSpec, manager
 		// the version is in the range.
 		sv, err := semver.Make(toSemVer(version))
 		if err != nil {
-			klog.Errorf("Failed to convert %q to semantic version: %s\n", version, err)
 			errs = append(errs, err)
 			validator.reporter.Report(nameWithVerRange, "internal error", bad)
 			continue