daemonconfig: only load mirrorsConfig for target host #401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
changweige
reviewed
Mar 7, 2023
config/daemonconfig/mirrors.go
Outdated
|
|
||
| func loadHostDir(hostsDir string) ([]hostConfig, error) { | ||
| b, err := os.ReadFile(filepath.Join(hostsDir, "hosts.toml")) | ||
| if err != nil && !os.IsNotExist(err) { |
There was a problem hiding this comment.
"hosts.toml" does not exit, should we skip parsing hosts config and don't update nydusd's mirrors config
There was a problem hiding this comment.
Yes, we should avoid returning an error if the file does not exist. Fixed.
changweige
reviewed
Mar 7, 2023
config/daemonconfig/mirrors.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| parsedMirrors, err := parseMirrorsConfig(hostConfig) |
There was a problem hiding this comment.
Forget to handle err==nil && hostDir="" ?
There was a problem hiding this comment.
Please handle that host.toml or registry host namespace dir can't be found accross
There was a problem hiding this comment.
Forget to handle err==nil && hostDir="" ?
If err==nil && hostDir="", just return nil to skip loading the mirror configuration for this host.
hostDir, err := hostDirFromRoot(mirrorsConfigDir, registryHost)
if err != nil {
return nil, err
}
if hostDir == "" {
return mirrors, nil
}
Now, we load all the mirrorsConfig from directory. And the mirrorsConfig is available to all hosts. This is not compatible with containerd's mirror configuration. This PR tries to solve this issue. Signed-off-by: Bin Tang <tangbin.bin@bytedance.com>
sctb512
force-pushed
the
load-mirrror-config-for-target-host
branch
2 times, most recently
from
a49bf01
to
4bf294d
Compare
Signed-off-by: Bin Tang <tangbin.bin@bytedance.com>
sctb512
force-pushed
the
load-mirrror-config-for-target-host
branch
from
4bf294d
to
8994651
Compare
changweige
approved these changes
Mar 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now, we load all the mirrorsConfig from directory. And the mirrorsConfig is available to all hosts. This is not compatible with containerd's mirror configuration. This PR tries to solve this issue.