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: conditionally drain docker logs on stop to avoid docker deployer to stay in infinite loop #8838

Merged
merged 2 commits into from
Jun 5, 2023

Conversation

renzodavid9
Copy link
Contributor

@renzodavid9 renzodavid9 commented Jun 1, 2023

Fixes: #8819

Description
This PR is to fix the Docker deployer that stays in an infinite loop when doing skaffold dev. The main reason behind this is the Docker logger trying to drain the logs from running containers when doing logger stop (stop is executed before remove). The docker logs drain is needed for verify and custom actions, so we are adding a new conditional flag to disable the option for skaffold dev.

@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Merging #8838 (61b0629) into main (290280e) will decrease coverage by 6.57%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main    #8838      +/-   ##
==========================================
- Coverage   70.48%   63.92%   -6.57%     
==========================================
  Files         515      620     +105     
  Lines       23150    31457    +8307     
==========================================
+ Hits        16317    20108    +3791     
- Misses       5776     9842    +4066     
- Partials     1057     1507     +450     
Impacted Files Coverage Δ
cmd/skaffold/app/cmd/completion.go 13.04% <0.00%> (-1.25%) ⬇️
cmd/skaffold/app/cmd/config/list.go 65.21% <ø> (ø)
cmd/skaffold/app/cmd/config/set.go 88.72% <ø> (ø)
cmd/skaffold/app/cmd/config/util.go 54.28% <ø> (ø)
cmd/skaffold/app/cmd/credits.go 100.00% <ø> (ø)
cmd/skaffold/app/cmd/credits/export.go 0.00% <0.00%> (ø)
cmd/skaffold/app/cmd/deploy.go 40.90% <0.00%> (-12.94%) ⬇️
cmd/skaffold/app/cmd/generate_pipeline.go 60.00% <ø> (ø)
cmd/skaffold/app/cmd/inspect_modules.go 65.00% <ø> (ø)
cmd/skaffold/app/cmd/inspect_profiles.go 66.66% <ø> (ø)
... and 40 more

... and 410 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@renzodavid9 renzodavid9 marked this pull request as ready for review June 2, 2023 13:59
@renzodavid9 renzodavid9 requested review from plumpy and ericzzzzzzz June 2, 2023 13:59
@renzodavid9 renzodavid9 merged commit 97de7db into GoogleContainerTools:main Jun 5, 2023
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.

Ctrl+C with Docker deployer not working
2 participants