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

Consolidate linux and windows containerd config templates #11707

Merged
merged 1 commit into from
Feb 5, 2025

Conversation

brandond
Copy link
Member

@brandond brandond commented Feb 4, 2025

Proposed Changes

Consolidate linux and windows containerd config templates.

There was no reason for these to ever be separated. 90% of the config in the Windows template was just copy-pasted default values. The few things that DO need to be different on Windows can be handled by existing template vars.

The windows template also had the wrong structure for registry auth, which broke authenticated pulls on windows.

Types of Changes

  • tech debt
  • bugfix

Verification

  • Note lack of separate os-specific templates
  • Will need to be tested in rke2 windows.

Testing

Linked Issues

User-Facing Change

The containerd config templates for linux and windows have been consolidated and are no longer os-specific.

Further Comments

@brandond brandond requested a review from a team as a code owner February 4, 2025 00:48
@brandond brandond force-pushed the consolidate-containerd-template branch 2 times, most recently from 804b334 to a468283 Compare February 4, 2025 01:34
@brandond brandond force-pushed the consolidate-containerd-template branch from a468283 to 134b08e Compare February 4, 2025 23:12
Copy link

codecov bot commented Feb 4, 2025

Codecov Report

Attention: Patch coverage is 33.33333% with 30 lines in your changes missing coverage. Please review.

Project coverage is 47.61%. Comparing base (f78769d) to head (134b08e).
Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
pkg/agent/config/config.go 21.05% 10 Missing and 5 partials ⚠️
pkg/agent/config/config_linux.go 42.30% 14 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11707      +/-   ##
==========================================
- Coverage   49.89%   47.61%   -2.28%     
==========================================
  Files         185      185              
  Lines       19353    19360       +7     
==========================================
- Hits         9656     9219     -437     
- Misses       8300     8805     +505     
+ Partials     1397     1336      -61     
Flag Coverage Δ
e2etests 40.34% <33.33%> (-3.79%) ⬇️
inttests 34.99% <24.44%> (-0.07%) ⬇️
unittests 17.04% <4.44%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants