diff --git a/controllers/module_reconciler.go b/controllers/module_reconciler.go index ee8ef5357..08273b6ca 100644 --- a/controllers/module_reconciler.go +++ b/controllers/module_reconciler.go @@ -380,8 +380,8 @@ func (r *ModuleReconciler) handleSigning(ctx context.Context, func (r *ModuleReconciler) checkImageExists(ctx context.Context, mod *kmmv1beta1.Module, km *kmmv1beta1.KernelMapping, imageName string) (bool, error) { registryAuthGetter := auth.NewRegistryAuthGetterFrom(r.Client, mod) - pullOptions := module.GetRelevantPullOptions(mod, km) - imageAvailable, err := r.registry.ImageExists(ctx, imageName, pullOptions, registryAuthGetter) + tlsOptions := module.GetRelevantTLSOptions(mod, km) + imageAvailable, err := r.registry.ImageExists(ctx, imageName, tlsOptions, registryAuthGetter) if err != nil { return false, fmt.Errorf("could not check if the image is available: %v", err) } diff --git a/internal/module/helper.go b/internal/module/helper.go index b38525923..394129b95 100644 --- a/internal/module/helper.go +++ b/internal/module/helper.go @@ -4,7 +4,7 @@ import ( kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1" ) -func GetRelevantPullOptions(mod *kmmv1beta1.Module, km *kmmv1beta1.KernelMapping) *kmmv1beta1.TLSOptions { +func GetRelevantTLSOptions(mod *kmmv1beta1.Module, km *kmmv1beta1.KernelMapping) *kmmv1beta1.TLSOptions { if km.RegistryTLS != nil { return km.RegistryTLS } diff --git a/internal/preflight/preflight.go b/internal/preflight/preflight.go index 55f546bf3..91af46e02 100644 --- a/internal/preflight/preflight.go +++ b/internal/preflight/preflight.go @@ -106,9 +106,9 @@ func (p *preflightHelper) verifyImage(ctx context.Context, mapping *kmmv1beta1.K moduleFileName := mod.Spec.ModuleLoader.Container.Modprobe.ModuleName + ".ko" baseDir := mod.Spec.ModuleLoader.Container.Modprobe.DirName - pullOptions := module.GetRelevantPullOptions(mod, mapping) + tlsOptions := module.GetRelevantTLSOptions(mod, mapping) registryAuthGetter := auth.NewRegistryAuthGetterFrom(p.client, mod) - digests, repoConfig, err := p.registryAPI.GetLayersDigests(ctx, image, pullOptions, registryAuthGetter) + digests, repoConfig, err := p.registryAPI.GetLayersDigests(ctx, image, tlsOptions, registryAuthGetter) if err != nil { log.Info("image layers inaccessible, image probably does not exists", "module name", mod.Name, "image", image) return false, fmt.Sprintf("image %s inaccessible or does not exists", image)