github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68455 from Klaven/kubeadm_883

Browse Source 
kubeadm 883 Updated logging to be consistent.
This commit is contained in:
k8s-ci-robot 2018-09-26 02:27:47 -07:00 committed by GitHub
commit 8c1fe2e1df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/join.go
View File

@ -331,7 +331,7 @@ func (j *Join) Run(out io.Writer) error {
} }
// run kubeadm init preflight checks for checking all the prequisites // run kubeadm init preflight checks for checking all the prequisites
glog.Infoln("[join] running pre-flight checks before initializing the new control plane instance") fmt.Printf("[join] running pre-flight checks before initializing the new control plane instance\n")
preflight.RunInitMasterChecks(utilsexec.New(), initConfiguration, j.ignorePreflightErrors) preflight.RunInitMasterChecks(utilsexec.New(), initConfiguration, j.ignorePreflightErrors)
// Prepares the node for hosting a new control plane instance by writing necessary // Prepares the node for hosting a new control plane instance by writing necessary

2
cmd/kubeadm/app/util/system/kernel_validator.go
View File

@ -78,7 +78,6 @@ func (k *KernelValidator) Validate(spec SysSpec) (error, error) {
// validateKernelVersion validates the kernel version. // validateKernelVersion validates the kernel version.
func (k *KernelValidator) validateKernelVersion(kSpec KernelSpec) error { func (k *KernelValidator) validateKernelVersion(kSpec KernelSpec) error {
glog.V(1).Info("Validating kernel version")
versionRegexps := kSpec.Versions versionRegexps := kSpec.Versions
for _, versionRegexp := range versionRegexps { for _, versionRegexp := range versionRegexps {
r := regexp.MustCompile(versionRegexp) r := regexp.MustCompile(versionRegexp)
@ -93,7 +92,6 @@ func (k *KernelValidator) validateKernelVersion(kSpec KernelSpec) error {
// validateKernelConfig validates the kernel configurations. // validateKernelConfig validates the kernel configurations.
func (k *KernelValidator) validateKernelConfig(kSpec KernelSpec) error { func (k *KernelValidator) validateKernelConfig(kSpec KernelSpec) error {
glog.V(1).Info("Validating kernel config")
allConfig, err := k.getKernelConfig() allConfig, err := k.getKernelConfig()
if err != nil { if err != nil {
return fmt.Errorf("failed to parse kernel config: %v", err) return fmt.Errorf("failed to parse kernel config: %v", err)

4
cmd/kubeadm/app/util/system/validators.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package system package system
import ( import (
"github.com/golang/glog" "fmt"
"k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/errors"
) )
@ -41,7 +41,7 @@ func Validate(spec SysSpec, validators []Validator) (error, error) {
var warns []error var warns []error
for _, v := range validators { for _, v := range validators {
glog.Infof("Validating %s...", v.Name()) fmt.Printf("Validating %s...\n", v.Name())
warn, err := v.Validate(spec) warn, err := v.Validate(spec)
errs = append(errs, err) errs = append(errs, err)
warns = append(warns, warn) warns = append(warns, warn)