mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2026-01-01 10:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatically determine registry options based on image name (#103)

Browse Source 
Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2020-06-22 00:19:59 +00:00
committed by GitHub
parent ca61056b3d
commit c0e3f7e85f
25 changed files with 287 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/app/job.go
View File

@@ -36,19 +36,23 @@ func (di *Diun) createJob(job model.Job) {
return
}
// Registry options
regOpts, err := di.cfg.GetRegOpts(job.Image.RegOptsID)
// Get registry options
reg, err := di.cfg.RegOpts.Select(job.Image.RegOpt, job.RegImage)
if err != nil {
sublog.Warn().Err(err).Msg("Registry options")
} else if reg != nil {
sublog.Debug().Str("regopt", reg.Name).Msg("Registry options will be used")
} else {
reg = (&model.RegOpt{}).GetDefaults()
}
regUser, err := utl.GetSecret(regOpts.Username, regOpts.UsernameFile)
regUser, err := utl.GetSecret(reg.Username, reg.UsernameFile)
if err != nil {
log.Warn().Err(err).Msgf("Cannot retrieve username secret for regopts %s", job.Image.RegOptsID)
log.Warn().Err(err).Msgf("Cannot retrieve username secret for regopts %s", reg.Name)
}
regPassword, err := utl.GetSecret(regOpts.Password, regOpts.PasswordFile)
regPassword, err := utl.GetSecret(reg.Password, reg.PasswordFile)
if err != nil {
log.Warn().Err(err).Msgf("Cannot retrieve password secret for regopts %s", job.Image.RegOptsID)
log.Warn().Err(err).Msgf("Cannot retrieve password secret for regopts %s", reg.Name)
}
// Set defaults
@@ -78,8 +82,8 @@ func (di *Diun) createJob(job model.Job) {
job.Registry, err = registry.New(registry.Options{
Username: regUser,
Password: regPassword,
Timeout: *regOpts.Timeout,
InsecureTLS: *regOpts.InsecureTLS,
Timeout: *reg.Timeout,
InsecureTLS: *reg.InsecureTLS,
UserAgent: di.meta.UserAgent,
ImageOs: job.Image.Platform.Os,
ImageArch: job.Image.Platform.Arch,