diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 0d83a4291a9174fe6c8d36ca88a5e3d74855605c..5d1c8560186a42ddf54dc9e2fbae66065cdeafaa 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -38,6 +38,9 @@ const DefaultPodCIDR = "10.244.0.0/16" // DefaultBindIPV4 is The default ip the container will bind to. const DefaultBindIPV4 = "127.0.0.1" +// BaseImage is the base image is used to spin up kic containers +const BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.1@sha256:c4ad2938877d2ae0d5b7248a5e7182ff58c0603165c3bedfe9d503e2d380a0db" + // Driver represents a kic driver https://minikube.sigs.k8s.io/docs/reference/drivers/kic/ type Driver struct { *drivers.BaseDriver @@ -258,8 +261,3 @@ func (d *Driver) nodeID(nameOrID string) (string, error) { } return string(id), err } - -// BaseImage returns the image used to spin up containers. in the future might pin down nodes per version -func BaseImage() (string, error) { - return "gcr.io/k8s-minikube/kicbase@sha256:c4ad2938877d2ae0d5b7248a5e7182ff58c0603165c3bedfe9d503e2d380a0db", nil -} diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 8dfaa0ec567c1075e88f7c94ea4e5bc290c752d1..69b86f3c74b3cc3a2a62a019523797a5d1f7439a 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -21,7 +21,6 @@ import ( "os/exec" "github.com/docker/machine/libmachine/drivers" - "github.com/golang/glog" "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/config" @@ -43,14 +42,10 @@ func init() { } func configure(mc config.MachineConfig) interface{} { - img, err := kic.BaseImage() - if err != nil { - glog.Errorf("err to getting kic image for %s: imgesha:%s", img, mc.KubernetesConfig.KubernetesVersion) - } return kic.NewDriver(kic.Config{ MachineName: mc.Name, StorePath: localpath.MiniPath(), - ImageDigest: img, + ImageDigest: kic.BaseImage, CPU: mc.CPUs, Memory: mc.Memory, HostBindPort: mc.KubernetesConfig.HostBindPort,