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

Incorporate image inspect data in play kube #2696

Merged

Conversation

haircommander
Copy link
Collaborator

@haircommander haircommander commented Mar 18, 2019

before, when an image signified a user, play kube ignored it. Incorporate that information.

Signed-off-by: Peter Hunt pehunt@redhat.com

@haircommander
Copy link
Collaborator Author

fixes: #2665

@haircommander
Copy link
Collaborator Author

/test images

before, when an image signified a user, play kube ignored it. Incorporate that information.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Mar 18, 2019

LGTM


imageData, _ := newImage.Inspect(ctx)

containerConfig.User = "0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this OK in a rootless scenario? But having said that, I'm not sure what else to set it to.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rootless is actually disabled in play kube right now. This is also the default in pkg/spec/createconfig.go 's ParseCreateConfig. So I think it's safe even when rootless is enabled

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, rootless uses a user namespace to map UIDs, so we want to maintain the UID 0 default there too

@rhatdan
Copy link
Member

rhatdan commented Mar 18, 2019

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, rhatdan

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2019
@@ -280,6 +289,7 @@ func kubeContainerToCreateConfig(containerYAML v1.Container, runtime *libpod.Run
for _, e := range containerYAML.Env {
envs[e.Name] = e.Value
}
containerConfig.Env = envs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, were we just... not using the environment variables before?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope I just scooted it up because an older PR I did split the for loop for envs and setting Env

@mheon
Copy link
Member

mheon commented Mar 18, 2019

LGTM

@rhatdan
Copy link
Member

rhatdan commented Mar 18, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2019
@openshift-merge-robot openshift-merge-robot merged commit 7ed8366 into containers:master Mar 18, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants