From cf9883628fb735ded05f9e20566ed65d4f28bc66 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sat, 4 Apr 2020 23:16:34 -0700 Subject: [PATCH 1/8] remove kic overlay network --- pkg/drivers/kic/types.go | 4 - .../bootstrapper/kubeadm/default_cni.go | 118 ------------------ pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 27 ---- 3 files changed, 149 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d31aac0b850a..e5acc79cb062 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -33,10 +33,6 @@ const ( Version = "v0.0.8" // SHA of the kic base image baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81" - - // OverlayImage is the cni plugin used for overlay image, created by kind. - // CNI plugin image used for kic drivers created by kind. - OverlayImage = "kindest/kindnetd:0.5.3" ) var ( diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go index fb5b0c55f597..da896eee8d77 100644 --- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go +++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go @@ -16,8 +16,6 @@ limitations under the License. package kubeadm -import "html/template" - // defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni // has been passed to `minikube start`. // @@ -44,119 +42,3 @@ const defaultCNIConfig = ` } } ` - -// kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go -var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`--- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kindnet -rules: - - apiGroups: - - policy - resources: - - podsecuritypolicies - verbs: - - use - resourceNames: - - kindnet - - apiGroups: - - "" - resources: - - nodes - verbs: - - list - - watch ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kindnet -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kindnet -subjects: -- kind: ServiceAccount - name: kindnet - namespace: kube-system ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kindnet - namespace: kube-system ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: kindnet - namespace: kube-system - labels: - tier: node - app: kindnet - k8s-app: kindnet -spec: - selector: - matchLabels: - app: kindnet - template: - metadata: - labels: - tier: node - app: kindnet - k8s-app: kindnet - spec: - hostNetwork: true - tolerations: - - operator: Exists - effect: NoSchedule - serviceAccountName: kindnet - containers: - - name: kindnet-cni - image: {{.ImageName}} - env: - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.hostIP - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: POD_SUBNET - value: 10.244.0.0/16 - volumeMounts: - - name: cni-cfg - mountPath: /etc/cni/net.d - - name: xtables-lock - mountPath: /run/xtables.lock - readOnly: false - - name: lib-modules - mountPath: /lib/modules - readOnly: true - resources: - requests: - cpu: "100m" - memory: "50Mi" - limits: - cpu: "100m" - memory: "50Mi" - securityContext: - privileged: false - capabilities: - add: ["NET_RAW", "NET_ADMIN"] - volumes: - - name: cni-cfg - hostPath: - path: /etc/cni/net.d - - name: xtables-lock - hostPath: - path: /run/xtables.lock - type: FileOrCreate - - name: lib-modules - hostPath: - path: /lib/modules - ---- -`)) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 9a65e7df8c3e..b52a543fb634 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -17,7 +17,6 @@ limitations under the License. package kubeadm import ( - "bytes" "context" "os/exec" "path" @@ -38,7 +37,6 @@ import ( "github.com/pkg/errors" "k8s.io/client-go/kubernetes" kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/kapi" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/bootstrapper" @@ -231,12 +229,6 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error { return errors.Wrap(err, "run") } - if cfg.Driver == driver.Docker { - if err := k.applyKicOverlay(cfg); err != nil { - return errors.Wrap(err, "apply kic overlay") - } - } - if err := k.applyNodeLabels(cfg); err != nil { glog.Warningf("unable to apply node labels: %v", err) } @@ -738,25 +730,6 @@ func reloadKubelet(runner command.Runner) error { return nil } -// applyKicOverlay applies the CNI plugin needed to make kic work -func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error { - // Allow no more than 5 seconds for apply kic overlay - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) - defer cancel() - cmd := exec.CommandContext(ctx, "sudo", - path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")), - "-f", "-") - b := bytes.Buffer{} - if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil { - return err - } - cmd.Stdin = bytes.NewReader(b.Bytes()) - if rr, err := k.c.RunCmd(cmd); err != nil { - return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output()) - } - return nil -} - // applyNodeLabels applies minikube labels to all the nodes func (k *Bootstrapper) applyNodeLabels(cfg config.ClusterConfig) error { // time cluster was created. time format is based on ISO 8601 (RFC 3339) From f72132b5eceace00bd5f53eded83ae6b0dea7e77 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sat, 4 Apr 2020 23:32:03 -0700 Subject: [PATCH 2/8] lint --- hack/preload-images/generate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go index a3160bc5a1a4..ebb50a8bf0cb 100644 --- a/hack/preload-images/generate.go +++ b/hack/preload-images/generate.go @@ -68,7 +68,7 @@ func generateTarball(kubernetesVersion, tarballFilename string) error { return errors.Wrap(err, "kubeadm images") } - for _, img := range append(imgs, kic.OverlayImage) { + for _, img := range imgs { cmd := exec.Command("docker", "exec", profile, "docker", "pull", img) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr From 2aacdde555e254d38679a0d4d2790aa28c5f2612 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sun, 5 Apr 2020 01:03:39 -0700 Subject: [PATCH 3/8] only remove kic overaly for docker driver --- pkg/drivers/kic/types.go | 4 + .../bootstrapper/kubeadm/default_cni.go | 117 ++++++++++++++++++ pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 28 +++++ 3 files changed, 149 insertions(+) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index e5acc79cb062..d31aac0b850a 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -33,6 +33,10 @@ const ( Version = "v0.0.8" // SHA of the kic base image baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81" + + // OverlayImage is the cni plugin used for overlay image, created by kind. + // CNI plugin image used for kic drivers created by kind. + OverlayImage = "kindest/kindnetd:0.5.3" ) var ( diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go index da896eee8d77..96e6627498fc 100644 --- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go +++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go @@ -16,6 +16,8 @@ limitations under the License. package kubeadm +import "html/template" + // defaultCNIConfig is the CNI config which is provisioned when --enable-default-cni // has been passed to `minikube start`. // @@ -42,3 +44,118 @@ const defaultCNIConfig = ` } } ` + +// kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go +var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kindnet +rules: + - apiGroups: + - policy + resources: + - podsecuritypolicies + verbs: + - use + resourceNames: + - kindnet + - apiGroups: + - "" + resources: + - nodes + verbs: + - list + - watch +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kindnet +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: kindnet +subjects: +- kind: ServiceAccount + name: kindnet + namespace: kube-system +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kindnet + namespace: kube-system +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: kindnet + namespace: kube-system + labels: + tier: node + app: kindnet + k8s-app: kindnet +spec: + selector: + matchLabels: + app: kindnet + template: + metadata: + labels: + tier: node + app: kindnet + k8s-app: kindnet + spec: + hostNetwork: true + tolerations: + - operator: Exists + effect: NoSchedule + serviceAccountName: kindnet + containers: + - name: kindnet-cni + image: {{.ImageName}} + env: + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: POD_SUBNET + value: 10.244.0.0/16 + volumeMounts: + - name: cni-cfg + mountPath: /etc/cni/net.d + - name: xtables-lock + mountPath: /run/xtables.lock + readOnly: false + - name: lib-modules + mountPath: /lib/modules + readOnly: true + resources: + requests: + cpu: "100m" + memory: "50Mi" + limits: + cpu: "100m" + memory: "50Mi" + securityContext: + privileged: false + capabilities: + add: ["NET_RAW", "NET_ADMIN"] + volumes: + - name: cni-cfg + hostPath: + path: /etc/cni/net.d + - name: xtables-lock + hostPath: + path: /run/xtables.lock + type: FileOrCreate + - name: lib-modules + hostPath: + path: /lib/modules +--- +`)) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index b52a543fb634..e0228819b7b0 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -17,6 +17,7 @@ limitations under the License. package kubeadm import ( + "bytes" "context" "os/exec" "path" @@ -37,6 +38,7 @@ import ( "github.com/pkg/errors" "k8s.io/client-go/kubernetes" kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/kapi" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/bootstrapper" @@ -229,6 +231,13 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error { return errors.Wrap(err, "run") } + // this is only required for containerd and cri-o runtime to avoid + if cfg.Driver == driver.Docker && cfg.KubernetesConfig.ContainerRuntime != "docker" { + if err := k.applyKicOverlay(cfg); err != nil { + return errors.Wrap(err, "apply kic overlay") + } + } + if err := k.applyNodeLabels(cfg); err != nil { glog.Warningf("unable to apply node labels: %v", err) } @@ -730,6 +739,25 @@ func reloadKubelet(runner command.Runner) error { return nil } +// applyKicOverlay applies the CNI plugin needed to make kic work +func (k *Bootstrapper) applyKicOverlay(cfg config.ClusterConfig) error { + // Allow no more than 5 seconds for apply kic overlay + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "sudo", + path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")), + "-f", "-") + b := bytes.Buffer{} + if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil { + return err + } + cmd.Stdin = bytes.NewReader(b.Bytes()) + if rr, err := k.c.RunCmd(cmd); err != nil { + return errors.Wrapf(err, "cmd: %s output: %s", rr.Command(), rr.Output()) + } + return nil +} + // applyNodeLabels applies minikube labels to all the nodes func (k *Bootstrapper) applyNodeLabels(cfg config.ClusterConfig) error { // time cluster was created. time format is based on ISO 8601 (RFC 3339) From e1650ac78dd25e41b288da891df3f218506b6275 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sun, 5 Apr 2020 01:05:03 -0700 Subject: [PATCH 4/8] revert default cni --- .../bootstrapper/kubeadm/default_cni.go | 225 +++++++++--------- 1 file changed, 113 insertions(+), 112 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/default_cni.go b/pkg/minikube/bootstrapper/kubeadm/default_cni.go index 96e6627498fc..fb5b0c55f597 100644 --- a/pkg/minikube/bootstrapper/kubeadm/default_cni.go +++ b/pkg/minikube/bootstrapper/kubeadm/default_cni.go @@ -46,116 +46,117 @@ const defaultCNIConfig = ` ` // kicCNIConfig is the cni plugin needed for kic uses cni plugin created by kind https://github.com/kubernetes-sigs/kind/blob/03a4b519067dc308308cce735065c47a6fda1583/pkg/build/node/cni.go -var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`--- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kindnet -rules: - - apiGroups: - - policy - resources: - - podsecuritypolicies - verbs: - - use - resourceNames: - - kindnet - - apiGroups: - - "" - resources: - - nodes - verbs: - - list - - watch ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: kindnet -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kindnet -subjects: -- kind: ServiceAccount - name: kindnet - namespace: kube-system ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kindnet - namespace: kube-system ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: kindnet - namespace: kube-system - labels: - tier: node - app: kindnet - k8s-app: kindnet -spec: - selector: - matchLabels: - app: kindnet - template: - metadata: - labels: - tier: node - app: kindnet - k8s-app: kindnet - spec: - hostNetwork: true - tolerations: - - operator: Exists - effect: NoSchedule - serviceAccountName: kindnet - containers: - - name: kindnet-cni - image: {{.ImageName}} - env: - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.hostIP - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: POD_SUBNET - value: 10.244.0.0/16 - volumeMounts: - - name: cni-cfg - mountPath: /etc/cni/net.d - - name: xtables-lock - mountPath: /run/xtables.lock - readOnly: false - - name: lib-modules - mountPath: /lib/modules - readOnly: true - resources: - requests: - cpu: "100m" - memory: "50Mi" - limits: - cpu: "100m" - memory: "50Mi" - securityContext: - privileged: false - capabilities: - add: ["NET_RAW", "NET_ADMIN"] - volumes: - - name: cni-cfg - hostPath: - path: /etc/cni/net.d - - name: xtables-lock - hostPath: - path: /run/xtables.lock - type: FileOrCreate - - name: lib-modules - hostPath: - path: /lib/modules ---- +var kicCNIConfig = template.Must(template.New("kubeletServiceTemplate").Parse(`--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kindnet +rules: + - apiGroups: + - policy + resources: + - podsecuritypolicies + verbs: + - use + resourceNames: + - kindnet + - apiGroups: + - "" + resources: + - nodes + verbs: + - list + - watch +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kindnet +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: kindnet +subjects: +- kind: ServiceAccount + name: kindnet + namespace: kube-system +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kindnet + namespace: kube-system +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: kindnet + namespace: kube-system + labels: + tier: node + app: kindnet + k8s-app: kindnet +spec: + selector: + matchLabels: + app: kindnet + template: + metadata: + labels: + tier: node + app: kindnet + k8s-app: kindnet + spec: + hostNetwork: true + tolerations: + - operator: Exists + effect: NoSchedule + serviceAccountName: kindnet + containers: + - name: kindnet-cni + image: {{.ImageName}} + env: + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: POD_SUBNET + value: 10.244.0.0/16 + volumeMounts: + - name: cni-cfg + mountPath: /etc/cni/net.d + - name: xtables-lock + mountPath: /run/xtables.lock + readOnly: false + - name: lib-modules + mountPath: /lib/modules + readOnly: true + resources: + requests: + cpu: "100m" + memory: "50Mi" + limits: + cpu: "100m" + memory: "50Mi" + securityContext: + privileged: false + capabilities: + add: ["NET_RAW", "NET_ADMIN"] + volumes: + - name: cni-cfg + hostPath: + path: /etc/cni/net.d + - name: xtables-lock + hostPath: + path: /run/xtables.lock + type: FileOrCreate + - name: lib-modules + hostPath: + path: /lib/modules + +--- `)) From deb16d67518923cd4789110a984dfda19db31fe8 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sun, 5 Apr 2020 01:23:11 -0700 Subject: [PATCH 5/8] copy kic overlay image only for docker run time tarball --- hack/preload-images/generate.go | 7 ++++++- hack/preload-images/preload_images.go | 2 +- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go index ebb50a8bf0cb..f178a6592bb0 100644 --- a/hack/preload-images/generate.go +++ b/hack/preload-images/generate.go @@ -33,7 +33,7 @@ import ( "k8s.io/minikube/pkg/minikube/localpath" ) -func generateTarball(kubernetesVersion, tarballFilename string) error { +func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string) error { defer func() { if err := deleteMinikube(); err != nil { fmt.Println(err) @@ -68,6 +68,10 @@ func generateTarball(kubernetesVersion, tarballFilename string) error { return errors.Wrap(err, "kubeadm images") } + 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.Stdout = os.Stdout @@ -93,6 +97,7 @@ func generateTarball(kubernetesVersion, tarballFilename string) error { } func createImageTarball(tarballFilename string) error { + // directories to save into tarball dirs := []string{ fmt.Sprintf("./lib/docker/%s", dockerStorageDriver), "./lib/docker/image", diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go index fcf06180d7c2..37bbd678e7d6 100644 --- a/hack/preload-images/preload_images.go +++ b/hack/preload-images/preload_images.go @@ -69,7 +69,7 @@ func main() { continue } 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) } if err := uploadTarball(tf); err != nil { diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index e0228819b7b0..f421af244800 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -232,7 +232,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error { } // this is only required for containerd and cri-o runtime to avoid - if cfg.Driver == driver.Docker && cfg.KubernetesConfig.ContainerRuntime != "docker" { + if driver.IsKIC(cfg.Driver) && cfg.KubernetesConfig.ContainerRuntime != "docker" { if err := k.applyKicOverlay(cfg); err != nil { return errors.Wrap(err, "apply kic overlay") } From 6676bbc697495dbb9e1dd6fc38de2f6004a2138d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Sun, 5 Apr 2020 01:26:29 -0700 Subject: [PATCH 6/8] add issue --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index f421af244800..3df6e8036822 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -231,7 +231,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error { return errors.Wrap(err, "run") } - // this is only required for containerd and cri-o runtime to avoid + // 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 { return errors.Wrap(err, "apply kic overlay") From a3480c0e14a6163e6642ad6b786ada6a190e766a Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 6 Apr 2020 18:55:55 -0700 Subject: [PATCH 7/8] bump preload image version --- pkg/minikube/download/preload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go index 59a0c4b7e098..e3f859a23b93 100644 --- a/pkg/minikube/download/preload.go +++ b/pkg/minikube/download/preload.go @@ -41,7 +41,7 @@ const ( // PreloadVersion is the current version of the preloaded tarball // // NOTE: You may need to bump this version up when upgrading auxiliary docker images - PreloadVersion = "v2" + PreloadVersion = "v3" // PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist PreloadBucket = "minikube-preloaded-volume-tarballs" ) From 75bc44212b0d419a5475252176f741cb6867f530 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 6 Apr 2020 20:10:11 -0700 Subject: [PATCH 8/8] dont bumpt preload version in this PR yet --- pkg/minikube/download/preload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go index e3f859a23b93..59a0c4b7e098 100644 --- a/pkg/minikube/download/preload.go +++ b/pkg/minikube/download/preload.go @@ -41,7 +41,7 @@ const ( // PreloadVersion is the current version of the preloaded tarball // // NOTE: You may need to bump this version up when upgrading auxiliary docker images - PreloadVersion = "v3" + PreloadVersion = "v2" // PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist PreloadBucket = "minikube-preloaded-volume-tarballs" )