810e9e107f
Fix boilerplates, comments in the code and make the output of kubeadm more user-friendly
Start using HostPKIPath and KubernetesDir everywhere in the code, so they can be changed for real
More robust kubeadm reset code now.
Removed old glog-things from app.Run()
Renamed /etc/kubernetes/cloud-config.json to /etc/kubernetes/cloud-config since it shouldn't be a json file
Simplification of the code
Less verbose output from master/pki.go
Cleaned up dead code
Start a small logging/output framework:
- fmt.Println("[the-stage-here] Capital first letter of this message. Tell the user what the current state is")
- fmt.Printf("[the-stage-here] Capital first letter. Maybe a [%v] in the end if an error should be displayed. Always ends with \n")
- fmt.Errorf("Never starts with []. Includes a short error message plus the underlying error in [%v]. Never ends with \n")
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
|
|
)
|
|
|
|
const (
|
|
DefaultErrorExitCode = 1
|
|
PreFlightExitCode = 2
|
|
)
|
|
|
|
type debugError interface {
|
|
DebugError() (msg string, args []interface{})
|
|
}
|
|
|
|
// fatal prints the message if set and then exits.
|
|
func fatal(msg string, code int) {
|
|
if len(msg) > 0 {
|
|
// add newline if needed
|
|
if !strings.HasSuffix(msg, "\n") {
|
|
msg += "\n"
|
|
}
|
|
|
|
fmt.Fprint(os.Stderr, msg)
|
|
}
|
|
os.Exit(code)
|
|
}
|
|
|
|
// CheckErr prints a user friendly error to STDERR and exits with a non-zero
|
|
// exit code. Unrecognized errors will be printed with an "error: " prefix.
|
|
//
|
|
// This method is generic to the command in use and may be used by non-Kubectl
|
|
// commands.
|
|
func CheckErr(err error) {
|
|
checkErr("", err, fatal)
|
|
}
|
|
|
|
// checkErr formats a given error as a string and calls the passed handleErr
|
|
// func with that string and an kubectl exit code.
|
|
func checkErr(prefix string, err error, handleErr func(string, int)) {
|
|
switch err.(type) {
|
|
case nil:
|
|
return
|
|
case *preflight.PreFlightError:
|
|
handleErr(err.Error(), PreFlightExitCode)
|
|
default:
|
|
handleErr(err.Error(), DefaultErrorExitCode)
|
|
}
|
|
}
|