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

Merge pull request #7425 from medyagh/remove_overlay 

remove kic overlay network for docker-runtime
pull/7385/head
Medya Ghazizadeh 2020-04-07 14:53:03 -07:00 committed by GitHub
parent a57dc855bc 75bc44212b
commit d84b9425c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/preload-images/generate.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/localpath"
) )
func generateTarball(kubernetesVersion, tarballFilename string) error { func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string) error {
defer func() { defer func() {
if err := deleteMinikube(); err != nil { if err := deleteMinikube(); err != nil {
fmt.Println(err) fmt.Println(err)
@ -68,7 +68,11 @@ func generateTarball(kubernetesVersion, tarballFilename string) error {
return errors.Wrap(err, "kubeadm images") return errors.Wrap(err, "kubeadm images")
} }
for _, img := range append(imgs, kic.OverlayImage) { if containerRuntime != "docker" { // kic overlay image is only needed by containerd and cri-o https://github.com/kubernetes/minikube/issues/7428
imgs = append(imgs, kic.OverlayImage)
}
for _, img := range imgs {
cmd := exec.Command("docker", "exec", profile, "docker", "pull", img) cmd := exec.Command("docker", "exec", profile, "docker", "pull", img)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
@ -93,6 +97,7 @@ func generateTarball(kubernetesVersion, tarballFilename string) error {
} }
func createImageTarball(tarballFilename string) error { func createImageTarball(tarballFilename string) error {
// directories to save into tarball
dirs := []string{ dirs := []string{
fmt.Sprintf("./lib/docker/%s", dockerStorageDriver), fmt.Sprintf("./lib/docker/%s", dockerStorageDriver),
"./lib/docker/image", "./lib/docker/image",

2
hack/preload-images/preload_images.go
View File

@ -69,7 +69,7 @@ func main() {
continue continue
} }
fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kv) fmt.Printf("A preloaded tarball for k8s version %s doesn't exist, generating now...\n", kv)
if err := generateTarball(kv, tf); err != nil { if err := generateTarball(kv, cr, tf); err != nil {
exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kv, cr), err) exit.WithError(fmt.Sprintf("generating tarball for k8s version %s with %s", kv, cr), err)
} }
if err := uploadTarball(tf); err != nil { if err := uploadTarball(tf); err != nil {

3
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

@ -231,7 +231,8 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
return errors.Wrap(err, "run") return errors.Wrap(err, "run")
} }
if cfg.Driver == driver.Docker { // this is required for containerd and cri-o runtime. till we close https://github.com/kubernetes/minikube/issues/7428
if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" {
if err := k.applyKicOverlay(cfg); err != nil { if err := k.applyKicOverlay(cfg); err != nil {
return errors.Wrap(err, "apply kic overlay") return errors.Wrap(err, "apply kic overlay")
} }