Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Add HOSTNAME to env by default for pod containers #895

Merged
merged 1 commit into from
Sep 5, 2018

Conversation

estesp
Copy link
Member

@estesp estesp commented Sep 5, 2018

To match expectations of users coming from Docker engine runtime, add
the HOSTNAME to the environment of new containers in a pod.

Signed-off-by: Phil Estes [email protected]

To match expectations of users coming from Docker engine runtime, add
the HOSTNAME to the environment of new containers in a pod.

Signed-off-by: Phil Estes <[email protected]>
@Random-Liu
Copy link
Member

/lgtm

We may want to cherry-pick this to fix containerd 1.1.x.

@Random-Liu Random-Liu added this to the v1.0 milestone Sep 5, 2018
@Random-Liu Random-Liu merged commit 1e471b1 into containerd:master Sep 5, 2018
@estesp
Copy link
Member Author

estesp commented Sep 5, 2018

I'm happy to add it back on that branch as well

@Random-Liu
Copy link
Member

Random-Liu commented Sep 6, 2018

It looks like this PR broke the e2e test. The reason is:

  1. cri-containerd e2e test started failing after this PR merged: https://k8s-testgrid.appspot.com/sig-node-containerd#e2e-gci
  2. containerd e2e test is fine (using old cri, which doesn't have this change), so kubernetes change can be mostly ruled out: https://k8s-testgrid.appspot.com/sig-node-containerd#containerd-e2e-gci

I'm going to revert this change for now, and see whether it brings back the test back to normal.

  • If it does, we need to revert the changes in supported branches, and investigate why this breaks the test.
  • If it doesn't, we can submit this PR again and find the actual root cause.

jterry75 referenced this pull request in jterry75/cri Sep 17, 2018
Revert "Add HOSTNAME to env by default for pod containers"
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants