Add .containerenv file to containers #5463

pjbgf · 2021-11-16T13:27:24Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This aligns CRI-O with podman, by adding a specific file to help programs running inside its containers to detected they are in fact running inside a container.

Which issue(s) this PR fixes:

Fixes #5461

Special notes for your reviewer:

Decided to use the same file name as podman, given that docker's approach is vendor specific.

Does this PR introduce a user-facing change?

Containers now have a `/run/.containerenv` file to help applications identify that they are running inside a container.

openshift-ci · 2021-11-16T13:27:33Z

Hi @pjbgf. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

saschagrunert

/ok-to-test

openshift-ci · 2021-11-16T13:33:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pjbgf, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

saschagrunert · 2021-11-16T13:34:01Z

Code LGTM, I think we can add the integration test later on, too.

server/container_create_linux.go

codecov · 2021-11-16T14:03:46Z

Codecov Report

Merging #5463 (3064a9d) into main (407d866) will decrease coverage by 0.00%.
The diff coverage is 38.09%.

@@            Coverage Diff             @@
##             main    #5463      +/-   ##
==========================================
- Coverage   43.53%   43.53%   -0.01%     
==========================================
  Files         118      118              
  Lines       11869    11890      +21     
==========================================
+ Hits         5167     5176       +9     
- Misses       6209     6219      +10     
- Partials      493      495       +2

haircommander · 2021-11-16T15:19:54Z

server/container_create_linux.go

 		return nil, err
 	}

+	// the existence of this file indicates that this is a container environment.


this function creates a file /run/.containerenv on the host, but doesn't mount it into the container. You'll want to do something similar to:
https://github.com/cri-o/cri-o/blob/main/server/container_create_linux.go#L596

@haircommander that makes sense now. I made a few changes and added a few tests. PTAL

pjbgf · 2021-11-17T13:03:17Z

Code LGTM, I think we can add the integration test later on, too.

thanks @saschagrunert. I ended up adding a few tests on this PR as to ensure it is working as expected - as I am not very familiar with the codebase. PTAL

pjbgf · 2021-11-17T13:14:08Z

/retest-required

littlejawa · 2021-11-17T15:21:12Z

ci/kata-jenkins is failing on the new test in ctr.bats :
# stat: can't stat '/run/.containerenv': No such file or directory

haircommander · 2021-11-17T15:43:27Z

server/container_create_linux.go

+		if err := sb.SetContainerEnvFile(); err != nil {
+			return nil, err
+		}


this should be called in server/sandbox_run_linux.go as it's recreating containerenv file each time a container is created, when i believe the intention is to share the container env file for the whole pod

pjbgf · 2021-11-17T23:18:11Z

/retest

pjbgf · 2021-11-18T09:29:34Z

/test kata-containers

This file indicates that the current environment is inside a container environment. The same technique is used by podman and docker. The same file name/path as podman was used, as it is vendor agnostic. Signed-off-by: Paulo Gomes <[email protected]>

pjbgf · 2021-11-18T16:57:58Z

/retest-required

haircommander · 2021-11-18T17:09:54Z

I don't think the test failures are related, they've been a bit funky lately.

this LGTM, I am going to wait to give the final tag so our bot doesn't spam retests.

Thank you for your contribution @pjbgf !

haircommander · 2021-11-18T17:10:19Z

/retest-required

pjbgf · 2021-11-18T17:14:55Z

Thank you for your contribution @pjbgf !

thank you @haircommander for the review and feedback. I am sure it won't be my last contribution. 🤞

haircommander · 2021-11-18T17:19:48Z

Thank you for your contribution @pjbgf !

thank you @haircommander for the review and feedback. I am sure it won't be my last contribution. crossed_fingers

excellent to hear 😎 let me know if you are looking for new tasks, we've got plenty 😃

pjbgf · 2021-11-19T12:39:43Z

/retest-required

pjbgf · 2021-11-19T12:41:35Z

excellent to hear sunglasses let me know if you are looking for new tasks, we've got plenty smiley

@haircommander I am trying to get a few things done on spo, once that is done I will reach out. 👍

haircommander · 2021-11-19T14:20:37Z

/lgtm

sounds good!

openshift-ci · 2021-11-19T14:42:15Z

@pjbgf: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2	`3064a9d`	link	false	`/test integration_cgroupv2`
ci/openshift-jenkins/e2e_crun_cgroupv2	`3064a9d`	link	false	`/test e2e_cgroupv2`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2021-11-19T15:11:16Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-11-19T15:23:18Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

pjbgf requested review from mrunalp and runcom as code owners November 16, 2021 13:27

openshift-ci bot requested review from giuseppe and sameo November 16, 2021 13:27

saschagrunert approved these changes Nov 16, 2021

View reviewed changes

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 16, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2021

sonatype-lift bot reviewed Nov 16, 2021

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

sonatype-lift bot reviewed Nov 16, 2021

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

haircommander reviewed Nov 16, 2021

View reviewed changes

haircommander reviewed Nov 17, 2021

View reviewed changes

Add containerenv file to containers

3064a9d

This file indicates that the current environment is inside a container environment. The same technique is used by podman and docker. The same file name/path as podman was used, as it is vendor agnostic. Signed-off-by: Paulo Gomes <[email protected]>

openshift-ci bot assigned haircommander Nov 19, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2021

openshift-merge-robot merged commit 2874194 into cri-o:main Nov 19, 2021

This was referenced Dec 2, 2021

Relabelling is needed for /run/.containerenv #5483

Closed

Relabel containerenv files #5484

Merged

Add .containerenv file to containers #5463

Add .containerenv file to containers #5463

Conversation

pjbgf commented Nov 16, 2021

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Nov 16, 2021

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Nov 16, 2021

Uh oh!

saschagrunert commented Nov 16, 2021

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Nov 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

haircommander Nov 16, 2021

Choose a reason for hiding this comment

Uh oh!

pjbgf Nov 17, 2021

Choose a reason for hiding this comment

Uh oh!

pjbgf commented Nov 17, 2021

Uh oh!

pjbgf commented Nov 17, 2021

Uh oh!

littlejawa commented Nov 17, 2021

Uh oh!

haircommander Nov 17, 2021

Choose a reason for hiding this comment

Uh oh!

pjbgf commented Nov 17, 2021

Uh oh!

pjbgf commented Nov 18, 2021

Uh oh!

pjbgf commented Nov 18, 2021

Uh oh!

haircommander commented Nov 18, 2021

Uh oh!

haircommander commented Nov 18, 2021

Uh oh!

pjbgf commented Nov 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

haircommander commented Nov 18, 2021

Uh oh!

pjbgf commented Nov 19, 2021

Uh oh!

pjbgf commented Nov 19, 2021

Uh oh!

haircommander commented Nov 19, 2021

Uh oh!

openshift-ci bot commented Nov 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented Nov 19, 2021

Uh oh!

openshift-bot commented Nov 19, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Nov 16, 2021 •

edited

Loading

pjbgf commented Nov 18, 2021 •

edited

Loading

openshift-ci bot commented Nov 19, 2021 •

edited

Loading