kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

registry: make serviceConfig.loadInsecureRegistries() more atomic

Browse source 
This removes the ugly hack where we stored the current config, tried to
reconfigure the service, and rolled back to the stored copy on failures.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-02-26 16:05:44 +01:00
parent dae2173568
commit 18de76a420
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
registry/config.go
View file

@ -159,21 +159,15 @@ func (config *serviceConfig) loadInsecureRegistries(registries []string) error {
// stop-gap for people who are running a private registry on localhost. // stop-gap for people who are running a private registry on localhost.
registries = append(registries, "127.0.0.0/8") registries = append(registries, "127.0.0.0/8")
// Store original InsecureRegistryCIDRs and IndexConfigs var (
// Clean InsecureRegistryCIDRs and IndexConfigs in config, as passed registries has all insecure registry info. insecureRegistryCIDRs = make([]*registry.NetIPNet, 0)
originalCIDRs := config.ServiceConfig.InsecureRegistryCIDRs indexConfigs = make(map[string]*registry.IndexInfo)
originalIndexInfos := config.ServiceConfig.IndexConfigs )
config.ServiceConfig.InsecureRegistryCIDRs = make([]*registry.NetIPNet, 0)
config.ServiceConfig.IndexConfigs = make(map[string]*registry.IndexInfo)
skip: skip:
for _, r := range registries { for _, r := range registries {
// validate insecure registry // validate insecure registry
if _, err := ValidateIndexName(r); err != nil { if _, err := ValidateIndexName(r); err != nil {
// before returning err, roll back to original data
config.ServiceConfig.InsecureRegistryCIDRs = originalCIDRs
config.ServiceConfig.IndexConfigs = originalIndexInfos
return err return err
} }
if strings.HasPrefix(strings.ToLower(r), "http://") { if strings.HasPrefix(strings.ToLower(r), "http://") {
@ -183,10 +177,6 @@ skip:
logrus.Warnf("insecure registry %s should not contain 'https://' and 'https://' has been removed from the insecure registry config", r) logrus.Warnf("insecure registry %s should not contain 'https://' and 'https://' has been removed from the insecure registry config", r)
r = r[8:] r = r[8:]
} else if hasScheme(r) { } else if hasScheme(r) {
// Insecure registry should not contain '://'
// before returning err, roll back to original data
config.ServiceConfig.InsecureRegistryCIDRs = originalCIDRs
config.ServiceConfig.IndexConfigs = originalIndexInfos
return invalidParamf("insecure registry %s should not contain '://'", r) return invalidParamf("insecure registry %s should not contain '://'", r)
} }
// Check if CIDR was passed to --insecure-registry // Check if CIDR was passed to --insecure-registry
@ -194,22 +184,19 @@ skip:
if err == nil { if err == nil {
// Valid CIDR. If ipnet is already in config.InsecureRegistryCIDRs, skip. // Valid CIDR. If ipnet is already in config.InsecureRegistryCIDRs, skip.
data := (*registry.NetIPNet)(ipnet) data := (*registry.NetIPNet)(ipnet)
for _, value := range config.InsecureRegistryCIDRs { for _, value := range insecureRegistryCIDRs {
if value.IP.String() == data.IP.String() && value.Mask.String() == data.Mask.String() { if value.IP.String() == data.IP.String() && value.Mask.String() == data.Mask.String() {
continue skip continue skip
} }
} }
// ipnet is not found, add it in config.InsecureRegistryCIDRs // ipnet is not found, add it in config.InsecureRegistryCIDRs
config.InsecureRegistryCIDRs = append(config.InsecureRegistryCIDRs, data) insecureRegistryCIDRs = append(insecureRegistryCIDRs, data)
} else { } else {
if err := validateHostPort(r); err != nil { if err := validateHostPort(r); err != nil {
config.ServiceConfig.InsecureRegistryCIDRs = originalCIDRs
config.ServiceConfig.IndexConfigs = originalIndexInfos
return invalidParamWrapf(err, "insecure registry %s is not valid", r) return invalidParamWrapf(err, "insecure registry %s is not valid", r)
} }
// Assume `host:port` if not CIDR. // Assume `host:port` if not CIDR.
config.IndexConfigs[r] = &registry.IndexInfo{ indexConfigs[r] = &registry.IndexInfo{
Name: r, Name: r,
Mirrors: make([]string, 0), Mirrors: make([]string, 0),
Secure: false, Secure: false,
@ -219,12 +206,14 @@ skip:
} }
// Configure public registry. // Configure public registry.
config.IndexConfigs[IndexName] = &registry.IndexInfo{ indexConfigs[IndexName] = &registry.IndexInfo{
Name: IndexName, Name: IndexName,
Mirrors: config.Mirrors, Mirrors: config.Mirrors,
Secure: true, Secure: true,
Official: true, Official: true,
} }
config.InsecureRegistryCIDRs = insecureRegistryCIDRs
config.IndexConfigs = indexConfigs
return nil return nil
} }