Remove dapper completely, rename local-XXXX to XXXX targets#13389
Open
dereknola wants to merge 3 commits intok3s-io:mainfrom
Open
Remove dapper completely, rename local-XXXX to XXXX targets#13389dereknola wants to merge 3 commits intok3s-io:mainfrom
local-XXXX to XXXX targets#13389dereknola wants to merge 3 commits intok3s-io:mainfrom
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #13389 +/- ##
==========================================
- Coverage 21.48% 21.45% -0.03%
==========================================
Files 190 190
Lines 15479 15492 +13
==========================================
- Hits 3325 3324 -1
- Misses 11701 11712 +11
- Partials 453 456 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola
changed the title
local-XXXX just XXXXX targetslocal-XXXX just XXXXX targets
dereknola
changed the title
local-XXXX just XXXXX targetslocal-XXXX to XXXX targets
dereknola
changed the title
local-XXXX to XXXX targetslocal-XXXX to XXXX targets
brandond
reviewed
Jan 22, 2026
Makefile
Outdated
| BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/\//-/g') | ||
| in-docker-%: ## Advanced: wraps any script in Docker environment, for example: in-docker-package-cli | ||
| mkdir -p ./bin/ ./dist ./build | ||
| docker buildx build -t k3s:$(BRANCH) --target infra -f Dockerfile . |
Member
There was a problem hiding this comment.
I don't think we actually need any context for this, since we end up mounting everything in? You can avoid having any context if you read the Dockerfile from stdin.
Suggested change
| docker buildx build -t k3s:$(BRANCH) --target infra -f Dockerfile . | |
| docker buildx build -t k3s:$(BRANCH) --target infra - < Dockerfile |
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
brandond
reviewed
Feb 3, 2026
| cd $(dirname $0)/.. | ||
|
|
||
| rm -rf dist bin build k3s hyperkube kubectl | ||
| rm -rf dist bin build k3s kubectl ./pkg/deploy/embed/* ./pkg/static/embed/* ./pkg/data/embed/* |
Member
There was a problem hiding this comment.
don't do this. there are .empty files in the embed directories that must exist, otherwise go:embed will fail go vet if you don't have all the embedded stuff pre-staged by make download
Maybe just do git clean -xffd to remove all untracked files?
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Proposed Changes
Remove dapper completely from k3s. Most of the make targets had already transition to nondapper, multistage docker build and run operations. This remove the remaining dapper targets and allows instead a "in-docker-XXXX" target for running extra scripts inside the
infracontainer layer.Types of Changes
CI improvements.
Verification
Tested release and GHA workflows
Testing
Linked Issues
N/A, perhaps stuff related to RISCV?
User-Facing Change
Further Comments