Merge pull request #1063 from dougborg/custom-rootless-image-fix

Only set default rootless image if it is not already customized
pull/1071/head
Tõnis Tiigi 3 years ago committed by GitHub
commit d64428cd2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -108,7 +108,9 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
if err != nil {
return nil, err
}
deploymentOpt.Image = bkimage.DefaultRootlessImage
if _, isImage := cfg.DriverOpts["image"]; !isImage {
deploymentOpt.Image = bkimage.DefaultRootlessImage
}
case "nodeselector":
kvs := strings.Split(strings.Trim(v, `"`), ",")
s := map[string]string{}

Loading…
Cancel
Save