Skip to content

Commit

Permalink
Removing the ImageMounter interface. (rh-ecosystem-edge#1196)
Browse files Browse the repository at this point in the history
Now that we are using the cluster's container-runtime to pull the
driver-container, then we don't need to manually pull and mount the
images from the worker's code anymore.

Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
  • Loading branch information
ybettan committed Sep 3, 2024
1 parent a15af73 commit fece1ae
Show file tree
Hide file tree
Showing 11 changed files with 5 additions and 855 deletions.
21 changes: 1 addition & 20 deletions cmd/worker/funcs_kmod.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ import (
func rootFuncPreRunE(cmd *cobra.Command, args []string) error {
logger.Info("Starting worker", "version", Version, "git commit", GitCommit)

im, err := getImageMounter(cmd)
if err != nil {
return fmt.Errorf("failed to get appropriate ImageMounter: %v", err)
}
mr := worker.NewModprobeRunner(logger)
w = worker.NewWorker(im, mr, logger)
w = worker.NewWorker(mr, logger)

return nil
}
Expand Down Expand Up @@ -78,18 +74,3 @@ func setCommandsFlags() {
"If true, extract the image from a tarball image instead of pulling from the registry",
)
}

func getImageMounter(cmd *cobra.Command) (worker.ImageMounter, error) {
flag := cmd.Flags().Lookup("tarball")
if flag.Changed {
return worker.NewTarImageMounter(worker.ImagesDir, logger), nil
}

logger.Info("Reading pull secrets", "base dir", worker.PullSecretsDir)
keyChain, err := worker.ReadKubernetesSecrets(cmd.Context(), worker.PullSecretsDir, logger)
if err != nil {
return nil, fmt.Errorf("could not read pull secrets: %v", err)
}
res := worker.NewMirrorResolver(logger)
return worker.NewRemoteImageMounter(worker.ImagesDir, res, keyChain, logger), nil
}
88 changes: 0 additions & 88 deletions internal/worker/imagemounter.go

This file was deleted.

65 changes: 0 additions & 65 deletions internal/worker/imagemounter_test.go

This file was deleted.

93 changes: 0 additions & 93 deletions internal/worker/mock_imagemounter.go

This file was deleted.

55 changes: 0 additions & 55 deletions internal/worker/mock_remoteimagemounter.go

This file was deleted.

Loading

0 comments on commit fece1ae

Please sign in to comment.