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

Jump to bottom

Solves docker cruntime notavail bug for --driver=none #16936

Closed
wants to merge 2 commits into from
Closed

Solves docker cruntime notavail bug for --driver=none #16936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263298a
Solves docker cruntime notavail bug
x7upLime Jul 23, 2023
3dc154a
Removes dbg message
x7upLime Jul 26, 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
29 changes: 18 additions & 11 deletions pkg/drivers/none/none.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ var cleanupPaths = []string{
type Driver struct {
*drivers.BaseDriver
*pkgdrivers.CommonDriver
URL string
runtime cruntime.Manager
exec command.Runner
URL string
runtime cruntime.Manager
exec command.Runner
NodeConfig Config
}

// Config is configuration for the None driver
Expand All @@ -61,24 +62,27 @@ type Config struct {

// NewDriver returns a fully configured None driver
func NewDriver(c Config) *Driver {
runner := command.NewExecRunner(true)
runtime, err := cruntime.New(cruntime.Config{Type: c.ContainerRuntime, Runner: runner})
// Libraries shouldn't panic, but there is no way for drivers to return error :(
if err != nil {
klog.Fatalf("unable to create container runtime: %v", err)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is just no point in initializing d.exec, d.runtime at this phase, since init is only called before the json marshal/unmarshal mechanism of libmachine, i.e. it would not survive that.

return &Driver{
BaseDriver: &drivers.BaseDriver{
MachineName: c.MachineName,
StorePath: c.StorePath,
},
runtime: runtime,
exec: runner,
NodeConfig: c,
}
}

// PreCreateCheck checks for correct privileges and dependencies
func (d *Driver) PreCreateCheck() error {
runner := command.NewExecRunner(true)
runtime, err := cruntime.New(cruntime.Config{Type: d.NodeConfig.ContainerRuntime, Runner: runner})
// Libraries shouldn't panic, but there is no way for drivers to return error :(
if err != nil {
klog.Fatalf("unable to create container runtime: %v", err)
}

d.runtime = runtime
d.exec = runner

return d.runtime.Available()
}

Expand Down Expand Up @@ -125,6 +129,9 @@ func (d *Driver) GetURL() (string, error) {

// GetState returns the state that the host is in (running, stopped, etc)
func (d *Driver) GetState() (state.State, error) {
runner := command.NewExecRunner(true)
d.exec = runner

Copy link
Contributor Author

@x7upLime x7upLime Jul 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we also initialize a runner here, since it is expected after provisioning phase, for enabling addons

hostname, port, err := kubeconfig.Endpoint(d.BaseDriver.MachineName)
if err != nil {
klog.Warningf("unable to get port: %v", err)
Expand Down
Loading