Skip to content

Commit

Permalink
tmp - fixing helper function's name
Browse files Browse the repository at this point in the history
Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
  • Loading branch information
ybettan committed Nov 23, 2022
1 parent 1f3cc47 commit 4d8aba7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions controllers/module_reconciler.go
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/module/helper.go
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions internal/preflight/preflight.go
Expand Up @@ -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)
Expand Down

0 comments on commit 4d8aba7

Please sign in to comment.