diff --git a/pkg/controller/install/install.go b/pkg/controller/install/install.go index b1b209e98..e4f3d744f 100644 --- a/pkg/controller/install/install.go +++ b/pkg/controller/install/install.go @@ -117,16 +117,15 @@ func (c *Controller) install(ctx context.Context, logE *logrus.Entry, cfgFilePat } return c.packageInstaller.InstallPackages(ctx, logE, &installpackage.ParamInstallPackages{ //nolint:wrapcheck - Config: cfg, - Registries: registryContents, - ConfigFilePath: cfgFilePath, - SkipLink: c.skipLink, - Tags: c.tags, - ExcludedTags: c.excludedTags, - PolicyConfigs: policyConfigs, - Checksums: checksums, - RequireChecksum: param.RequireChecksum, - EnforceRequireChecksum: param.EnforceRequireChecksum, - DisablePolicy: param.DisablePolicy, + Config: cfg, + Registries: registryContents, + ConfigFilePath: cfgFilePath, + SkipLink: c.skipLink, + Tags: c.tags, + ExcludedTags: c.excludedTags, + PolicyConfigs: policyConfigs, + Checksums: checksums, + RequireChecksum: cfg.RequireChecksum(param.EnforceRequireChecksum, param.RequireChecksum), + DisablePolicy: param.DisablePolicy, }) } diff --git a/pkg/installpackage/installer.go b/pkg/installpackage/installer.go index ec5cbf365..887aae8cc 100644 --- a/pkg/installpackage/installer.go +++ b/pkg/installpackage/installer.go @@ -106,17 +106,16 @@ type Unarchiver interface { } type ParamInstallPackages struct { - ConfigFilePath string - Config *aqua.Config - Registries map[string]*registry.Config - Tags map[string]struct{} - ExcludedTags map[string]struct{} - PolicyConfigs []*policy.Config - Checksums *checksum.Checksums - SkipLink bool - EnforceRequireChecksum bool - RequireChecksum bool - DisablePolicy bool + ConfigFilePath string + Config *aqua.Config + Registries map[string]*registry.Config + Tags map[string]struct{} + ExcludedTags map[string]struct{} + PolicyConfigs []*policy.Config + Checksums *checksum.Checksums + SkipLink bool + RequireChecksum bool + DisablePolicy bool } type ParamInstallPackage struct { @@ -206,7 +205,7 @@ func (is *Installer) InstallPackages(ctx context.Context, logE *logrus.Entry, pa if err := is.InstallPackage(ctx, logE, &ParamInstallPackage{ Pkg: pkg, Checksums: param.Checksums, - RequireChecksum: param.Config.RequireChecksum(param.EnforceRequireChecksum, param.RequireChecksum), + RequireChecksum: param.RequireChecksum, PolicyConfigs: param.PolicyConfigs, DisablePolicy: param.DisablePolicy, }); err != nil {