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

fix issues

pull/9316/head
Priya Wadhwa 2020-10-05 11:49:28 -04:00
parent 4cff79008c
commit d6acf7f4cb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/drivers/kic/kic.go
View File

@ -157,6 +157,9 @@ func (d *Driver) Create() error {
glog.Infof("duration metric: took %f seconds to extract preloaded images to volume", time.Since(t).Seconds()) glog.Infof("duration metric: took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
} }
}() }()
if pErr == oci.ErrInsufficientDockerStorage {
return pErr
}
if err := oci.CreateContainerNode(params); err != nil { if err := oci.CreateContainerNode(params); err != nil {
return errors.Wrap(err, "create kic node") return errors.Wrap(err, "create kic node")
@ -167,7 +170,7 @@ func (d *Driver) Create() error {
} }
waitForPreload.Wait() waitForPreload.Wait()
return pErr return nil
} }
// prepareSSH will generate keys and copy to the container so minikube ssh works // prepareSSH will generate keys and copy to the container so minikube ssh works

3
test/integration/status_test.go
View File

@ -30,7 +30,6 @@ import (
"k8s.io/minikube/cmd/minikube/cmd" "k8s.io/minikube/cmd/minikube/cmd"
"k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/localpath"
"k8s.io/minikube/pkg/minikube/reason"
) )
func TestInsufficientStorage(t *testing.T) { func TestInsufficientStorage(t *testing.T) {
@ -85,7 +84,7 @@ func verifyClusterState(t *testing.T, contents []byte) {
t.Fatalf("unmarshalling: %v", err) t.Fatalf("unmarshalling: %v", err)
} }
// verify the status looks as we expect // verify the status looks as we expect
if cs.StatusCode != reason.ExInsufficientStorage { if cs.StatusCode != cmd.InsufficientStorage {
t.Fatalf("incorrect status code: %v", cs.StatusCode) t.Fatalf("incorrect status code: %v", cs.StatusCode)
} }
if cs.StatusName != "InsufficientStorage" { if cs.StatusName != "InsufficientStorage" {