-
Notifications
You must be signed in to change notification settings - Fork 40k
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
MESOS: inject certain MESOS_ envvars into all container env #20845
MESOS: inject certain MESOS_ envvars into all container env #20845
Conversation
Labelling this PR as size/XL |
GCE e2e test build/test passed for commit aa8ac7e9f839b64be520e31b6dc52e418547ea95. |
GCE e2e test build/test passed for commit 88916c546873ed1bacd5ec51b7ebae2036f1ea06. |
GCE e2e test build/test passed for commit 2cb5a540cc1ed49931472605d3d1811dc056d802. |
if rpod, err := rpf.registry.Update(p); err == nil { | ||
// pod is bound to a task, and the update is compatible | ||
// so we'll allow it through | ||
p = rpod.Pod() // use the (possibly) updated pod spec! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is losing the updated pod spec
GCE e2e build/test failed for commit 569908898901de3921ddcc43ce648c778e6d92bf. |
GCE e2e test build/test passed for commit f3702017f1a8513af3ec13c019721d15a9f446c5. |
GCE e2e test build/test passed for commit 7d9879a3b2c3732473420f55fd0356d8b332e9c4. |
log.V(2).Infof("sent %d pod updates", len(pods)) | ||
} | ||
|
||
func ContainerEnvOverlay(env []api.EnvVar) Option { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename this simply ContainerEnvironment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually, debating whether I should write PrependFilter
and AppendFilter
option funcs that accept Filter
params, and just move the environment-related stuff into the caller (to keep this module simpler)
GCE e2e test build/test passed for commit 9efe4f08c5880409d0ecfbd82e2a26f2c2749cc7. |
GCE e2e test build/test passed for commit 77403ad969985d11d81cc152a59d4779e42f57e7. |
// once it appears in the pod registry. the stock kubelet sets the pod host in order | ||
// to accomplish the same; we do this because the k8sm scheduler works differently. | ||
podutil.Annotator(map[string]string{ | ||
meta.BindingHostKey: s.HostnameOverride, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pretty sure that the HostnameOverride
here is the same as the agent name that was being used from the SlaveInfo
during registration. Need to double-check
GCE e2e test build/test passed for commit 42bd169c65897b8de3d61c4d7f497a38070e49a3. |
GCE e2e test build/test passed for commit 64da4dfa24bb7c68fd7f45769c4af1f5a8d2860b. |
spawned by kubelet: static and non-static pod user containers, as well as pod infrastructure containers.
64da4df
to
fc1c435
Compare
squashed, will LGTM once passes all tests |
Automatic merge from submit-queue |
Auto commit by PR queue bot
GCE e2e test build/test passed for commit fc1c435. |
xref d2iq-archive/kubernetes-mesos#739
TODO:
**api.Pod
to*api.Pod
and expand result as(bool,*api.Pod)
envContainerID