Skip to content
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

fix: set config_path in Containerd config #364

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Feb 15, 2024

Set config_path in the Containerd config as described in https://github.com/containerd/containerd/blob/main/docs/hosts.md#cri

This is not enough, we also need to remove registry.mirrors from the config file, opening in case @jimmidyson you have some ideas on how we can do this, TOML doesn't have a nil value:

Feb 15 05:59:13 docker-quick-start-helm-addon-cilium-rjfjv-hn9m7 containerd[7127]: time="2024-02-15T05:59:13.663662461Z" level=warning msg="failed to load plugin io.containerd.grpc.v1.cri" error="invalid plugin config: `mirrors` cannot be set when `config_path` is provided"

No additional changes are needed, the unnecessary mirror configuration will be removed from the OS image instead.

@dkoshkin dkoshkin self-assigned this Feb 15, 2024
@github-actions github-actions bot added the fix label Feb 15, 2024
@jimmidyson
Copy link
Member

I'm confused why registry.mirrors is in the config file in the first place?

@jimmidyson
Copy link
Member

I just tested it in with Docker provider and didn't see any problem with this?

@dkoshkin dkoshkin marked this pull request as ready for review February 15, 2024 16:45
@github-actions github-actions bot added fix and removed fix labels Feb 15, 2024
@jimmidyson jimmidyson merged commit f9be2dd into main Feb 15, 2024
15 checks passed
@jimmidyson jimmidyson deleted the dkoshkin/fix-set-config_path branch February 15, 2024 17:02
@github-actions github-actions bot mentioned this pull request Feb 15, 2024
dkoshkin pushed a commit that referenced this pull request Feb 15, 2024
🤖 I have created a release *beep* *boop*
---


## 0.4.2 (2024-02-15)

<!-- Release notes generated using configuration in .github/release.yaml
at main -->

## What's Changed
### Fixes 🔧
* fix: remove word konvoy/ and use cre/ by @dkoshkin in
#365
* fix: v2/ in Containerd mirror path by @dkoshkin in
#363
* fix: set config_path in Containerd config by @dkoshkin in
#364
* fix: generate config with only globalImageRegistryMirror set by
@dkoshkin in
#362
### Other Changes
* refactor: Fix formatting issue by @jimmidyson in
#368
* build: Include CAPX APis by @jimmidyson in
#367
* build: Upgrade golangci-lint to 1.56.1 by @jimmidyson in
#369
* docs: Update examples to be clusterctl templates by @jimmidyson in
#361


**Full Changelog**:
v0.4.1...v0.4.2

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants