-
Notifications
You must be signed in to change notification settings - Fork 203
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add registry configuration breakout to containerd/config.toml #1369
Add registry configuration breakout to containerd/config.toml #1369
Conversation
Adds a config entry to reference /etc/containerd/certs.d, which can contain registry configuration and trusted root CAs for use when connecting to private registries.
5930dcf
to
d6b53dd
Compare
I tested this in a standalone and it seems to work great - the config is now limited to 1.22.x only where we have containerd 1.5, which is where the option support came in. Only issue I see - none of our actual test cases in AgentBaker seem to build 1.22 clusters right now, so none of the test data includes the config statement. I'm not quite sure what the best way to add that test case in would be. |
k8s version is in the describle table tests here: AgentBaker/pkg/agent/baker_test.go Lines 23 to 30 in 7a18f18
a case like this with 1.22+containerd would be good to cover this scenario I think: AgentBaker/pkg/agent/baker_test.go Lines 530 to 535 in 7a18f18
otherwise PR lgtm, appreciate it :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thanks for adding a test case!
@alexeldeib I don't have write access, so would please you merge or help me fix that? |
Adds a config entry to reference /etc/containerd/certs.d, which can contain per registry configuration files. This will allow customers to drop off config files with a DaemonSet that will modify how containerd acts when it connects to certain registries.
Enabled scenarios:
Fixes AKS/1940 and helps with some of the people in AKS/2259 for Linux nodepools.
See: