bump golang lint ci to latest
parent
d4c1c2a79f
commit
1207de734b
2
Makefile
2
Makefile
|
@ -68,7 +68,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
|
||||||
|
|
||||||
KERNEL_VERSION ?= 4.19.171
|
KERNEL_VERSION ?= 4.19.171
|
||||||
# latest from https://github.com/golangci/golangci-lint/releases
|
# latest from https://github.com/golangci/golangci-lint/releases
|
||||||
GOLINT_VERSION ?= v1.30.0
|
GOLINT_VERSION ?= v1.39.0
|
||||||
# Limit number of default jobs, to avoid the CI builds running out of memory
|
# Limit number of default jobs, to avoid the CI builds running out of memory
|
||||||
GOLINT_JOBS ?= 4
|
GOLINT_JOBS ?= 4
|
||||||
# see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
|
# see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
|
||||||
|
|
|
@ -140,7 +140,7 @@ var settings = []Setting{
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: Bootstrapper,
|
name: Bootstrapper,
|
||||||
set: SetString, //TODO(r2d4): more validation here?
|
set: SetString,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: config.ShowDriverDeprecationNotification,
|
name: config.ShowDriverDeprecationNotification,
|
||||||
|
|
|
@ -133,7 +133,7 @@ func AskForPasswordValue(s string) string {
|
||||||
|
|
||||||
result, err := concealableAskForStaticValue(os.Stdin, s, true)
|
result, err := concealableAskForStaticValue(os.Stdin, s, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
defer log.Fatal(err)
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,7 +159,7 @@ func TestDeleteAllProfiles(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("tempdir: %v", err)
|
t.Fatalf("tempdir: %v", err)
|
||||||
}
|
}
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(td)
|
err := os.RemoveAll(td)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", td)
|
t.Errorf("failed to clean up temp folder %q", td)
|
||||||
|
|
|
@ -274,7 +274,7 @@ func podmanEnvVars(ec PodmanEnvConfig) map[string]string {
|
||||||
constants.PodmanContainerHostEnv: podmanURL(ec.username, ec.hostname, ec.port),
|
constants.PodmanContainerHostEnv: podmanURL(ec.username, ec.hostname, ec.port),
|
||||||
constants.PodmanContainerSSHKeyEnv: ec.keypath,
|
constants.PodmanContainerSSHKeyEnv: ec.keypath,
|
||||||
}
|
}
|
||||||
//common
|
// common
|
||||||
env0 := map[string]string{
|
env0 := map[string]string{
|
||||||
constants.MinikubeActivePodmanEnv: ec.profile,
|
constants.MinikubeActivePodmanEnv: ec.profile,
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,7 +155,7 @@ func Execute() {
|
||||||
|
|
||||||
if err := RootCmd.Execute(); err != nil {
|
if err := RootCmd.Execute(); err != nil {
|
||||||
// Cobra already outputs the error, typically because the user provided an unknown command.
|
// Cobra already outputs the error, typically because the user provided an unknown command.
|
||||||
os.Exit(reason.ExProgramUsage)
|
defer os.Exit(reason.ExProgramUsage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,6 @@ func main() {
|
||||||
err = cmd.GenerateBashCompletion(f, cmd.RootCmd)
|
err = cmd.GenerateBashCompletion(f, cmd.RootCmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
os.Exit(1)
|
defer os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,8 +143,8 @@ var Addons = []*Addon{
|
||||||
name: "registry-aliases",
|
name: "registry-aliases",
|
||||||
set: SetBool,
|
set: SetBool,
|
||||||
callbacks: []setFn{EnableOrDisableAddon},
|
callbacks: []setFn{EnableOrDisableAddon},
|
||||||
//TODO - add other settings
|
// TODO - add other settings
|
||||||
//TODO check if registry addon is enabled
|
// TODO check if registry addon is enabled
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "storage-provisioner",
|
name: "storage-provisioner",
|
||||||
|
|
|
@ -340,13 +340,13 @@ func (t tempError) Error() string {
|
||||||
return "Temporary error: " + t.Err.Error()
|
return "Temporary error: " + t.Err.Error()
|
||||||
}
|
}
|
||||||
|
|
||||||
//recoverFromUncleanShutdown searches for an existing hyperkit.pid file in
|
// recoverFromUncleanShutdown searches for an existing hyperkit.pid file in
|
||||||
//the machine directory. If it can't find it, a clean shutdown is assumed.
|
// the machine directory. If it can't find it, a clean shutdown is assumed.
|
||||||
//If it finds the pid file, it checks for a running hyperkit process with that pid
|
// If it finds the pid file, it checks for a running hyperkit process with that pid
|
||||||
//as the existence of a file might not indicate an unclean shutdown but an actual running
|
// as the existence of a file might not indicate an unclean shutdown but an actual running
|
||||||
//hyperkit server. This is an error situation - we shouldn't start minikube as there is likely
|
// hyperkit server. This is an error situation - we shouldn't start minikube as there is likely
|
||||||
//an instance running already. If the PID in the pidfile does not belong to a running hyperkit
|
// an instance running already. If the PID in the pidfile does not belong to a running hyperkit
|
||||||
//process, we can safely delete it, and there is a good chance the machine will recover when restarted.
|
// process, we can safely delete it, and there is a good chance the machine will recover when restarted.
|
||||||
func (d *Driver) recoverFromUncleanShutdown() error {
|
func (d *Driver) recoverFromUncleanShutdown() error {
|
||||||
stateDir := filepath.Join(d.StorePath, "machines", d.MachineName)
|
stateDir := filepath.Join(d.StorePath, "machines", d.MachineName)
|
||||||
pidFile := filepath.Join(stateDir, pidFileName)
|
pidFile := filepath.Join(stateDir, pidFileName)
|
||||||
|
|
|
@ -27,7 +27,7 @@ func TestExtractFile(t *testing.T) {
|
||||||
if nil != err {
|
if nil != err {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(testDir)
|
err := os.RemoveAll(testDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", testDir)
|
t.Errorf("failed to clean up temp folder %q", testDir)
|
||||||
|
|
|
@ -103,7 +103,7 @@ var Addons = map[string]*Addon{
|
||||||
"auto-pause.service",
|
"auto-pause.service",
|
||||||
"0640"),
|
"0640"),
|
||||||
|
|
||||||
//GuestPersistentDir
|
// GuestPersistentDir
|
||||||
}, false, "auto-pause", map[string]string{
|
}, false, "auto-pause", map[string]string{
|
||||||
"AutoPauseHook": "azhao155/auto-pause-hook:1.13",
|
"AutoPauseHook": "azhao155/auto-pause-hook:1.13",
|
||||||
}, map[string]string{
|
}, map[string]string{
|
||||||
|
|
|
@ -186,9 +186,9 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
ignore := []string{
|
ignore := []string{
|
||||||
fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestManifestsDir, "/", "-", -1)),
|
fmt.Sprintf("DirAvailable-%s", strings.ReplaceAll(vmpath.GuestManifestsDir, "/", "-")),
|
||||||
fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestPersistentDir, "/", "-", -1)),
|
fmt.Sprintf("DirAvailable-%s", strings.ReplaceAll(vmpath.GuestPersistentDir, "/", "-")),
|
||||||
fmt.Sprintf("DirAvailable-%s", strings.Replace(bsutil.EtcdDataDir(), "/", "-", -1)),
|
fmt.Sprintf("DirAvailable-%s", strings.ReplaceAll(bsutil.EtcdDataDir(), "/", "-")),
|
||||||
"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
|
"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
|
||||||
"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
|
"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
|
||||||
"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
|
"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
|
||||||
|
|
|
@ -278,7 +278,7 @@ func TestGetPrimaryControlPlane(t *testing.T) {
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
// To save converted config file from old style config at ./testdata/.minikube,
|
// To save converted config file from old style config at ./testdata/.minikube,
|
||||||
//rather than at env(MINIKUBE_HOME) which depends on test environment
|
// rather than at env(MINIKUBE_HOME) which depends on test environment
|
||||||
originalMinikubeHomeEnv := os.Getenv("MINIKUBE_HOME")
|
originalMinikubeHomeEnv := os.Getenv("MINIKUBE_HOME")
|
||||||
err = os.Setenv("MINIKUBE_HOME", miniDir)
|
err = os.Setenv("MINIKUBE_HOME", miniDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -522,7 +522,7 @@ func (f *FakeRunner) systemctl(args []string, root bool) (string, error) { // no
|
||||||
out += "[Unit]\n"
|
out += "[Unit]\n"
|
||||||
out += "Description=Docker Application Container Engine\n"
|
out += "Description=Docker Application Container Engine\n"
|
||||||
out += "Documentation=https://docs.docker.com\n"
|
out += "Documentation=https://docs.docker.com\n"
|
||||||
//out += "BindsTo=containerd.service\n"
|
// out += "BindsTo=containerd.service\n"
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
return out, fmt.Errorf("%s cat unimplemented", svc)
|
return out, fmt.Errorf("%s cat unimplemented", svc)
|
||||||
|
|
|
@ -28,7 +28,7 @@ import (
|
||||||
"k8s.io/minikube/pkg/minikube/style"
|
"k8s.io/minikube/pkg/minikube/style"
|
||||||
)
|
)
|
||||||
|
|
||||||
//PossibleLeftOvers deletes KIC & non-KIC drivers left
|
// PossibleLeftOvers deletes KIC & non-KIC drivers left
|
||||||
func PossibleLeftOvers(ctx context.Context, cname string, driverName string) {
|
func PossibleLeftOvers(ctx context.Context, cname string, driverName string) {
|
||||||
bin := ""
|
bin := ""
|
||||||
switch driverName {
|
switch driverName {
|
||||||
|
|
|
@ -415,7 +415,7 @@ func checkBinaryExpression(b *ast.BinaryExpr) string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Check the right side
|
// Check the right side
|
||||||
if l, ok := b.Y.(*ast.BasicLit); ok {
|
if l, ok := b.Y.(*ast.BasicLit); ok {
|
||||||
if x := checkString(l.Value); x != "" {
|
if x := checkString(l.Value); x != "" {
|
||||||
s += x
|
s += x
|
||||||
|
|
|
@ -36,7 +36,7 @@ func TestExtract(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Creating temp dir: %v", err)
|
t.Fatalf("Creating temp dir: %v", err)
|
||||||
}
|
}
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(tempdir)
|
err := os.RemoveAll(tempdir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", tempdir)
|
t.Errorf("failed to clean up temp folder %q", tempdir)
|
||||||
|
|
|
@ -233,7 +233,7 @@ func TestUpdate(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Error making temp directory %v", err)
|
t.Fatalf("Error making temp directory %v", err)
|
||||||
}
|
}
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(tmpDir)
|
err := os.RemoveAll(tmpDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
||||||
|
|
|
@ -142,12 +142,12 @@ func MachinePath(machine string, miniHome ...string) string {
|
||||||
func SanitizeCacheDir(image string) string {
|
func SanitizeCacheDir(image string) string {
|
||||||
if runtime.GOOS == "windows" && hasWindowsDriveLetter(image) {
|
if runtime.GOOS == "windows" && hasWindowsDriveLetter(image) {
|
||||||
// not sanitize Windows drive letter.
|
// not sanitize Windows drive letter.
|
||||||
s := image[:2] + strings.Replace(image[2:], ":", "_", -1)
|
s := image[:2] + strings.ReplaceAll(image[2:], ":", "_")
|
||||||
klog.Infof("windows sanitize: %s -> %s", image, s)
|
klog.Infof("windows sanitize: %s -> %s", image, s)
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
// ParseReference cannot have a : in the directory path
|
// ParseReference cannot have a : in the directory path
|
||||||
return strings.Replace(image, ":", "_", -1)
|
return strings.ReplaceAll(image, ":", "_")
|
||||||
}
|
}
|
||||||
|
|
||||||
func hasWindowsDriveLetter(s string) bool {
|
func hasWindowsDriveLetter(s string) bool {
|
||||||
|
@ -197,7 +197,7 @@ func getWindowsVolumeNameCmd(d string) (string, error) {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
outs := strings.Split(strings.Replace(string(stdout), "\r", "", -1), "\n")
|
outs := strings.Split(strings.ReplaceAll(string(stdout), "\r", ""), "\n")
|
||||||
|
|
||||||
var vname string
|
var vname string
|
||||||
for _, l := range outs {
|
for _, l := range outs {
|
||||||
|
|
|
@ -33,7 +33,7 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Error make tmp directory: %v", err)
|
t.Fatalf("Error make tmp directory: %v", err)
|
||||||
}
|
}
|
||||||
defer func(path string) { //clean up tempdir
|
defer func(path string) { // clean up tempdir
|
||||||
err := os.RemoveAll(path)
|
err := os.RemoveAll(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", path)
|
t.Errorf("failed to clean up temp folder %q", path)
|
||||||
|
|
|
@ -93,7 +93,7 @@ func TestCacheBinariesForBootstrapper(t *testing.T) {
|
||||||
t.Fatalf("error during creating tmp dir: %v", err)
|
t.Fatalf("error during creating tmp dir: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(minikubeHome)
|
err := os.RemoveAll(minikubeHome)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", minikubeHome)
|
t.Errorf("failed to clean up temp folder %q", minikubeHome)
|
||||||
|
|
|
@ -432,7 +432,7 @@ func setupKubeconfig(h *host.Host, cc *config.ClusterConfig, n *config.Node, clu
|
||||||
}
|
}
|
||||||
|
|
||||||
if cc.KubernetesConfig.APIServerName != constants.APIServerName {
|
if cc.KubernetesConfig.APIServerName != constants.APIServerName {
|
||||||
addr = strings.Replace(addr, n.IP, cc.KubernetesConfig.APIServerName, -1)
|
addr = strings.ReplaceAll(addr, n.IP, cc.KubernetesConfig.APIServerName)
|
||||||
}
|
}
|
||||||
kcs := &kubeconfig.Settings{
|
kcs := &kubeconfig.Settings{
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
|
|
|
@ -62,7 +62,7 @@ func TestShouldCheckURL(t *testing.T) {
|
||||||
// test that update notifications get triggered if it has been longer than 24 hours
|
// test that update notifications get triggered if it has been longer than 24 hours
|
||||||
viper.Set(config.ReminderWaitPeriodInHours, 24)
|
viper.Set(config.ReminderWaitPeriodInHours, 24)
|
||||||
|
|
||||||
//time.Time{} returns time -> January 1, year 1, 00:00:00.000000000 UTC.
|
// time.Time{} returns time -> January 1, year 1, 00:00:00.000000000 UTC.
|
||||||
if err := writeTimeToFile(lastUpdateCheckFilePath, time.Time{}); err != nil {
|
if err := writeTimeToFile(lastUpdateCheckFilePath, time.Time{}); err != nil {
|
||||||
t.Errorf("write failed: %v", err)
|
t.Errorf("write failed: %v", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -386,9 +386,9 @@ func applyTmpl(format string, a ...V) string {
|
||||||
|
|
||||||
// escape any outstanding '%' signs so that they don't get interpreted
|
// escape any outstanding '%' signs so that they don't get interpreted
|
||||||
// as a formatting directive down the line
|
// as a formatting directive down the line
|
||||||
out = strings.Replace(out, "%", "%%", -1)
|
out = strings.ReplaceAll(out, "%", "%%")
|
||||||
// avoid doubling up in case this function is called multiple times
|
// avoid doubling up in case this function is called multiple times
|
||||||
out = strings.Replace(out, "%%%%", "%%", -1)
|
out = strings.ReplaceAll(out, "%%%%", "%%")
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ const (
|
||||||
var (
|
var (
|
||||||
outputFile io.Writer = os.Stdout
|
outputFile io.Writer = os.Stdout
|
||||||
|
|
||||||
//GetUUID returns the UUID function to use
|
// GetUUID returns the UUID function to use
|
||||||
GetUUID = randomID
|
GetUUID = randomID
|
||||||
|
|
||||||
eventFile *os.File
|
eventFile *os.File
|
||||||
|
|
|
@ -171,7 +171,7 @@ func checkDockerVersion(o string) registry.State {
|
||||||
case 2:
|
case 2:
|
||||||
p = append(p, "0") // patch version not found
|
p = append(p, "0") // patch version not found
|
||||||
case 3:
|
case 3:
|
||||||
//remove postfix string for unstable(test/nightly) channel. https://docs.docker.com/engine/install/
|
// remove postfix string for unstable(test/nightly) channel. https://docs.docker.com/engine/install/
|
||||||
p[2] = strings.SplitN(p[2], "-", 2)[0]
|
p[2] = strings.SplitN(p[2], "-", 2)[0]
|
||||||
default:
|
default:
|
||||||
return registry.State{
|
return registry.State{
|
||||||
|
|
|
@ -30,7 +30,7 @@ import (
|
||||||
|
|
||||||
func TestGenerateCACert(t *testing.T) {
|
func TestGenerateCACert(t *testing.T) {
|
||||||
tmpDir, err := ioutil.TempDir("", "")
|
tmpDir, err := ioutil.TempDir("", "")
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(tmpDir)
|
err := os.RemoveAll(tmpDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
||||||
|
@ -63,7 +63,7 @@ func TestGenerateCACert(t *testing.T) {
|
||||||
|
|
||||||
func TestGenerateSignedCert(t *testing.T) {
|
func TestGenerateSignedCert(t *testing.T) {
|
||||||
tmpDir, err := ioutil.TempDir("", "")
|
tmpDir, err := ioutil.TempDir("", "")
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(tmpDir)
|
err := os.RemoveAll(tmpDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
t.Errorf("failed to clean up temp folder %q", tmpDir)
|
||||||
|
@ -74,7 +74,7 @@ func TestGenerateSignedCert(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
signerTmpDir, err := ioutil.TempDir("", "")
|
signerTmpDir, err := ioutil.TempDir("", "")
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(signerTmpDir)
|
err := os.RemoveAll(signerTmpDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", signerTmpDir)
|
t.Errorf("failed to clean up temp folder %q", signerTmpDir)
|
||||||
|
|
|
@ -89,7 +89,7 @@ func TestChownR(t *testing.T) {
|
||||||
if nil != err {
|
if nil != err {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(testDir)
|
err := os.RemoveAll(testDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", testDir)
|
t.Errorf("failed to clean up temp folder %q", testDir)
|
||||||
|
@ -143,7 +143,7 @@ func TestMaybeChownDirRecursiveToMinikubeUser(t *testing.T) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(testDir)
|
err := os.RemoveAll(testDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up temp folder %q", testDir)
|
t.Errorf("failed to clean up temp folder %q", testDir)
|
||||||
|
|
|
@ -1444,7 +1444,7 @@ func validateCertSync(ctx context.Context, t *testing.T, profile string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strip carriage returned by ssh
|
// Strip carriage returned by ssh
|
||||||
got := strings.Replace(rr.Stdout.String(), "\r", "", -1)
|
got := strings.ReplaceAll(rr.Stdout.String(), "\r", "")
|
||||||
if diff := cmp.Diff(string(want), got); diff != "" {
|
if diff := cmp.Diff(string(want), got); diff != "" {
|
||||||
t.Errorf("failed verify pem file. minikube_test.pem -> %s mismatch (-want +got):\n%s", vp, diff)
|
t.Errorf("failed verify pem file. minikube_test.pem -> %s mismatch (-want +got):\n%s", vp, diff)
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) { // no
|
||||||
}
|
}
|
||||||
|
|
||||||
tempDir, err := ioutil.TempDir("", "mounttest")
|
tempDir, err := ioutil.TempDir("", "mounttest")
|
||||||
defer func() { //clean up tempdir
|
defer func() { // clean up tempdir
|
||||||
err := os.RemoveAll(tempDir)
|
err := os.RemoveAll(tempDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("failed to clean up %q temp folder.", tempDir)
|
t.Errorf("failed to clean up %q temp folder.", tempDir)
|
||||||
|
|
|
@ -400,7 +400,7 @@ func PVCWait(ctx context.Context, t *testing.T, profile string, ns string, name
|
||||||
return wait.PollImmediate(1*time.Second, timeout, f)
|
return wait.PollImmediate(1*time.Second, timeout, f)
|
||||||
}
|
}
|
||||||
|
|
||||||
//// VolumeSnapshotWait waits for volume snapshot to be ready to use
|
// VolumeSnapshotWait waits for volume snapshot to be ready to use
|
||||||
func VolumeSnapshotWait(ctx context.Context, t *testing.T, profile string, ns string, name string, timeout time.Duration) error {
|
func VolumeSnapshotWait(ctx context.Context, t *testing.T, profile string, ns string, name string, timeout time.Duration) error {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ func installRelease(version string) (f *os.File, err error) {
|
||||||
|
|
||||||
// legacyStartArgs returns the arguments normally used for starting older versions of minikube
|
// legacyStartArgs returns the arguments normally used for starting older versions of minikube
|
||||||
func legacyStartArgs() []string {
|
func legacyStartArgs() []string {
|
||||||
return strings.Split(strings.Replace(*startArgs, "--driver", "--vm-driver", -1), " ")
|
return strings.Split(strings.ReplaceAll(*startArgs, "--driver", "--vm-driver"), " ")
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestRunningBinaryUpgrade upgrades a running legacy cluster to minikube at HEAD
|
// TestRunningBinaryUpgrade upgrades a running legacy cluster to minikube at HEAD
|
||||||
|
|
Loading…
Reference in New Issue