Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes storage_driver option from /etc/docker/daemon.json #16235

Closed
wants to merge 3 commits into from
Closed

Removes storage_driver option from /etc/docker/daemon.json #16235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e1fc8e
Removes storage-driver directive from iso and docker runtime code
x7upLime Apr 12, 2023
9dd9ceb
Updating ISO to v1.30.1-1681929734-16235
minikube-bot Apr 20, 2023
38ee82a
Makes sure we're targeting the right cri-docker services
x7upLime Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.30.1
ISO_VERSION ?= v1.30.1-1681929734-16235

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
3 changes: 1 addition & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
},
"storage-driver": "overlay2"
}
}
3 changes: 1 addition & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/daemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
},
"storage-driver": "overlay2"
}
}
2 changes: 1 addition & 1 deletion pkg/minikube/cruntime/cruntime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func New(c Config) (Manager, error) {
// There is no more dockershim socket, in Kubernetes version 1.24 and beyond
if sp == "" && c.KubernetesVersion.GTE(semver.MustParse("1.24.0-alpha.0")) {
sp = ExternalDockerCRISocket
cs = "cri-docker.socket"
cs = "cri-docker"
}
return &Docker{
Socket: sp,
Expand Down
7 changes: 3 additions & 4 deletions pkg/minikube/cruntime/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
}

if r.CRIService != "" {
if err := r.Init.Enable("cri-docker.socket"); err != nil {
if err := r.Init.Enable(r.CRIService); err != nil {
return err
}
if err := r.Init.Unmask(r.CRIService); err != nil {
Expand All @@ -174,7 +174,7 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
if err := r.Init.Restart(r.CRIService); err != nil {
return err
}
if err := r.Init.Restart("cri-docker"); err != nil {
if err := r.Init.Restart(r.CRIService); err != nil {
return err
}
}
Expand Down Expand Up @@ -535,8 +535,7 @@ func (r *Docker) setCGroup(driver string) error {
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
},
"storage-driver": "overlay2"
}
}
`, driver)
ma := assets.NewMemoryAsset([]byte(daemonConfig), "/etc/docker", "daemon.json", "0644")
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const fileScheme = "file"
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
func DefaultISOURLs() []string {
v := version.GetISOVersion()
isoBucket := "minikube/iso"
isoBucket := "minikube-builds/iso/16235"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down