change flag name to --base-image
parent
513d84700c
commit
ca5c8953e8
|
@ -99,7 +99,7 @@ const (
|
|||
nodes = "nodes"
|
||||
preload = "preload"
|
||||
deleteOnFailure = "delete-on-failure"
|
||||
dockerBaseImage = "docker-base-image"
|
||||
kicBaseImage = "base-image"
|
||||
)
|
||||
|
||||
// initMinikubeFlags includes commandline flags for minikube.
|
||||
|
@ -120,7 +120,7 @@ func initMinikubeFlags() {
|
|||
startCmd.Flags().Bool(downloadOnly, false, "If true, only download and cache files for later use - don't install or start anything.")
|
||||
startCmd.Flags().Bool(cacheImages, true, "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.")
|
||||
startCmd.Flags().StringSlice(isoURL, download.DefaultISOURLs(), "Locations to fetch the minikube ISO from.")
|
||||
startCmd.Flags().String(dockerBaseImage, kic.BaseImage, "The base image to use for docker/podman drivers. Intended for local development.")
|
||||
startCmd.Flags().String(kicBaseImage, kic.BaseImage, "The base image to use for docker/podman drivers. Intended for local development.")
|
||||
startCmd.Flags().Bool(keepContext, false, "This will keep the existing kubectl context and will create a minikube context.")
|
||||
startCmd.Flags().Bool(embedCerts, false, "if true, will embed the certs in kubeconfig.")
|
||||
startCmd.Flags().String(containerRuntime, "docker", "The container runtime to be used (docker, crio, containerd).")
|
||||
|
|
|
@ -101,7 +101,7 @@ func doCacheBinaries(k8sVersion string) error {
|
|||
// BeginDownloadKicArtifacts downloads the kic image + preload tarball, returns true if preload is available
|
||||
func beginDownloadKicArtifacts(g *errgroup.Group) {
|
||||
glog.Info("Beginning downloading kic artifacts")
|
||||
baseImage := viper.GetString("docker-base-image")
|
||||
baseImage := viper.GetString("base-image")
|
||||
if !image.ExistsImageInDaemon(baseImage) {
|
||||
out.T(out.Pulling, "Pulling base image ...")
|
||||
g.Go(func() error {
|
||||
|
|
|
@ -60,7 +60,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
|
|||
return kic.NewDriver(kic.Config{
|
||||
MachineName: driver.MachineName(cc, n),
|
||||
StorePath: localpath.MiniPath(),
|
||||
ImageDigest: viper.GetString("docker-base-image"),
|
||||
ImageDigest: viper.GetString("base-image"),
|
||||
CPU: cc.CPUs,
|
||||
Memory: cc.Memory,
|
||||
OCIBinary: oci.Docker,
|
||||
|
|
|
@ -51,7 +51,7 @@ func init() {
|
|||
}
|
||||
|
||||
func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
|
||||
baseImage := viper.GetString("docker-base-image")
|
||||
baseImage := viper.GetString("base-image")
|
||||
return kic.NewDriver(kic.Config{
|
||||
MachineName: driver.MachineName(cc, n),
|
||||
StorePath: localpath.MiniPath(),
|
||||
|
|
Loading…
Reference in New Issue