提交 de0d603c 编写于 作者: M Medya Gh

convert base image to a const

上级 8a0c840e
......@@ -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
}
......@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册