containerd: add flag to add additional-hosts #9238

Kump3r · 2025-07-23T14:50:15Z

Changes proposed by this PR

Based on #6549, we want to maintain the adopt the functionally of adding additional DNS host entries to the /etc/hosts file of the container.

main functionallity
docker-compose local test of the env variable CONCOURSE_CONTAINERD_ADDITIONAL_HOSTS
unit/integration tests
bosh deployment introduction of env variable - Additional hosts support in Concourse Bosh Release concourse-bosh-release#185
helm chart introduction of env variable - Additional hosts support in Concourse Helm Chart concourse-chart#381
documentation in the runtime section of configuring worker - Additonal hosts support in Concourse Docs docs#566

Notes to reviewer

N/A

taylorsilva

Wow, so easy! Was looking to see when /etc/hosts gets added to the file store and found it here:

concourse/worker/runtime/cni_network.go

Lines 401 to 407 in 8419676

    
           etcHosts, err := n.store.Create( 
        
           	filepath.Join(handle, "/hosts"), 
        
           	[]byte("127.0.0.1 localhost\n"), 
        
           ) 
        
           if err != nil { 
        
           	return nil, fmt.Errorf("creating /etc/hosts: %w", err) 
        
           }

This looks good! Add the tests and this will be good to merge 🚀

taylorsilva · 2025-07-23T18:00:42Z

Thanks for doing all the packaging stuff as well! ❤️

Signed-off-by: Kump3r <tonevkalin@gmail.com>

Signed-off-by: ceco556 <ceco456@gmail.com>

IvanChalukov

I’ve tested this locally and it behaves as expected. Nice job! I’ve added a few small suggestions around error handling to help make it a bit more resilient.

worker/runtime/cni_network.go

worker/runtime/cni_network_test.go

Signed-off-by: Kump3r <tonevkalin@gmail.com>

Kump3r · 2025-07-25T07:15:30Z

Thanks for your feedback, we considered all of them previously as I mentioned, so it was a no brainer in adding them. It was just after a long day, so I totally messed up the previous unit tests 😅

worker/runtime/cni_network.go

worker/runtime/cni_network_test.go

Kump3r · 2025-07-25T10:19:17Z

You are absolutely right, when I was adjusting the tests, I switched the order and didn't think it matters as I forgot I already prepared the other packaging stuff. Nice catch!

…ng missed test for IP verification failures Signed-off-by: Kump3r <tonevkalin@gmail.com>

IvanChalukov

Tested locally with the following configurations:

No CONCOURSE_CONTAINERD_ADDITIONAL_HOSTS set → ✅ no changes to containers, behaves as expected
Invalid values: CONCOURSE_CONTAINERD_ADDITIONAL_HOSTS: 1.2.3.4 example.com,5.6.7.8.1 another-example.com → ✅ fails to create container and print appropriate error message
Valid values: CONCOURSE_CONTAINERD_ADDITIONAL_HOSTS: 1.2.3.4 example.com,5.6.7.8 another-example.com → ✅ entries applied successfully to containers

Everything works as expected from my perspective - nice work!

Signed-off-by: Taylor Silva <dev@taydev.net>

taylorsilva

Quickly repeated Ivan's tests and got the same results. I added an additional commit that clarifies the format we expect the IP and hostname to be passed in with.

Will let the PR checks go through one last time and then merge.

Kump3r · 2025-07-27T19:04:56Z

Thanks guys! Feel free to check the packaging stuff as they should be pretty straightforward as well.

Kump3r added containerd enhancement labels Jul 23, 2025

This was referenced Jul 23, 2025

Additional hosts support in Concourse Helm Chart concourse/concourse-chart#381

Merged

Additional hosts support in Concourse Bosh Release concourse/concourse-bosh-release#185

Merged

Additonal hosts support in Concourse Docs concourse/docs#566

Merged

taylorsilva reviewed Jul 23, 2025

View reviewed changes

ceco556 force-pushed the additional-dns branch 4 times, most recently from 72f05cb to 10cb05c Compare July 24, 2025 10:42

Kump3r and others added 3 commits July 24, 2025 13:52

Adding initial idea for containerd additional host. Not tested

74c2f68

Signed-off-by: Kump3r <tonevkalin@gmail.com>

Remove docker-compose value

a799dc3

Signed-off-by: Kump3r <tonevkalin@gmail.com>

Add cni_network tests

f1b7ac9

Signed-off-by: ceco556 <ceco456@gmail.com>

ceco556 force-pushed the additional-dns branch from 10cb05c to f1b7ac9 Compare July 24, 2025 10:55

Kump3r marked this pull request as ready for review July 24, 2025 10:57

Kump3r requested a review from a team as a code owner July 24, 2025 10:57

IvanChalukov reviewed Jul 24, 2025

View reviewed changes

worker/runtime/cni_network.go Outdated Show resolved Hide resolved

worker/runtime/cni_network.go Show resolved Hide resolved

worker/runtime/cni_network.go Outdated Show resolved Hide resolved

worker/runtime/cni_network_test.go Show resolved Hide resolved

Kump3r added 2 commits July 25, 2025 00:15

Addressing comments

eb464bc

Signed-off-by: Kump3r <tonevkalin@gmail.com>

Fixing tests

9a1d9de

Signed-off-by: Kump3r <tonevkalin@gmail.com>

IvanChalukov suggested changes Jul 25, 2025

View reviewed changes

Reversing the order to IP HOST as it was originally intended and addi…

4e58cd7

…ng missed test for IP verification failures Signed-off-by: Kump3r <tonevkalin@gmail.com>

Kump3r requested a review from IvanChalukov July 25, 2025 12:28

IvanChalukov approved these changes Jul 25, 2025

View reviewed changes

taylorsilva added this to the v7.14.0 milestone Jul 25, 2025

taylorsilva added this to Pull Requests Jul 25, 2025

github-project-automation bot moved this to Todo in Pull Requests Jul 25, 2025

taylorsilva moved this from Todo to In Progress in Pull Requests Jul 25, 2025

Kump3r requested a review from taylorsilva July 27, 2025 06:47

clarify how IP and hostname are passed into the worker command

7fda56b

Signed-off-by: Taylor Silva <dev@taydev.net>

taylorsilva approved these changes Jul 27, 2025

View reviewed changes

taylorsilva merged commit dc67a49 into concourse:master Jul 28, 2025
12 checks passed

github-project-automation bot moved this from In Progress to Done in Pull Requests Jul 28, 2025

taylorsilva changed the title ~~containerd: add flag to add addintional-hosts~~ containerd: add flag to add additional-hosts Aug 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

containerd: add flag to add additional-hosts #9238

containerd: add flag to add additional-hosts #9238

Uh oh!

Kump3r commented Jul 23, 2025 •

edited

Loading

Uh oh!

taylorsilva left a comment

Uh oh!

taylorsilva commented Jul 23, 2025

Uh oh!

IvanChalukov left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kump3r commented Jul 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kump3r commented Jul 25, 2025

Uh oh!

IvanChalukov left a comment

Uh oh!

taylorsilva left a comment

Uh oh!

Kump3r commented Jul 27, 2025

Uh oh!

Uh oh!

Uh oh!

	etcHosts, err := n.store.Create(
	filepath.Join(handle, "/hosts"),
	[]byte("127.0.0.1 localhost\n"),
	)
	if err != nil {
	return nil, fmt.Errorf("creating /etc/hosts: %w", err)
	}

Uh oh!

containerd: add flag to add additional-hosts #9238

containerd: add flag to add additional-hosts #9238

Uh oh!

Conversation

Kump3r commented Jul 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed by this PR

Notes to reviewer

Uh oh!

taylorsilva left a comment

Choose a reason for hiding this comment

Uh oh!

taylorsilva commented Jul 23, 2025

Uh oh!

IvanChalukov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kump3r commented Jul 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kump3r commented Jul 25, 2025

Uh oh!

IvanChalukov left a comment

Choose a reason for hiding this comment

Uh oh!

taylorsilva left a comment

Choose a reason for hiding this comment

Uh oh!

Kump3r commented Jul 27, 2025

Uh oh!

Uh oh!

Uh oh!

Kump3r commented Jul 23, 2025 •

edited

Loading