github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14553 from mesosphere/sttts-fix-daemonsets-on-mesos

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-02 19:16:08 -07:00
commit 02f878cf5b
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/mesos/docker/docker-compose.yml
View File

@ -85,6 +85,7 @@ apiserver:
--cloud-config=/opt/mesos-cloud.conf
--tls-cert-file=/var/run/kubernetes/auth/apiserver.crt
--tls-private-key-file=/var/run/kubernetes/auth/apiserver.key
--runtime-config=experimental/v1alpha1
--v=4
ports: [ "8888:8888", "6443:6443" ]
environment:

37
contrib/mesos/pkg/executor/executor.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/node"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
"k8s.io/kubernetes/pkg/api"
unversionedapi "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/framework"
@ -376,21 +377,25 @@ func (k *KubernetesExecutor) handleChangedApiserverPod(pod *api.Pod) {
oldPod := k.pods[task.podName]
// terminating pod?
if oldPod != nil && oldPod.DeletionTimestamp == nil &&
pod.DeletionTimestamp != nil && pod.Status.Phase == api.PodRunning &&
pod.DeletionGracePeriodSeconds != nil && *pod.DeletionGracePeriodSeconds > 0 {
if oldPod != nil && pod.Status.Phase == api.PodRunning {
timeModified := differentTime(oldPod.DeletionTimestamp, pod.DeletionTimestamp)
graceModified := differentPeriod(oldPod.DeletionGracePeriodSeconds, pod.DeletionGracePeriodSeconds)
if timeModified || graceModified {
log.Infof("pod %s/%s is terminating at %v with %vs grace period, telling kubelet", pod.Namespace, pod.Name, *pod.DeletionTimestamp, *pod.DeletionGracePeriodSeconds)
log.Infof("pod %s/%s is terminating at %v with %vs grace period, telling kubelet", pod.Namespace, pod.Name, *pod.DeletionTimestamp, *pod.DeletionGracePeriodSeconds)
// modify the pod in our registry instead of sending the new pod. The later
// would allow that other changes bleed into the kubelet. For now we are
// very conservative changing this behaviour.
// TODO(sttts): check whether we can and should send all changes down to the kubelet
oldPod.DeletionTimestamp = pod.DeletionTimestamp
oldPod.DeletionGracePeriodSeconds = pod.DeletionGracePeriodSeconds
// modify pod in our registry to avoid that other changed bleed into the kubelet
oldPod.DeletionTimestamp = pod.DeletionTimestamp
oldPod.DeletionGracePeriodSeconds = pod.DeletionGracePeriodSeconds
update := kubelet.PodUpdate{
Op: kubelet.UPDATE,
Pods: []*api.Pod{oldPod},
update := kubelet.PodUpdate{
Op: kubelet.UPDATE,
Pods: []*api.Pod{oldPod},
}
k.updateChan <- update
}
k.updateChan <- update
}
}
@ -940,3 +945,11 @@ func (k *KubernetesExecutor) sendLoop() {
}
}
}
func differentTime(a, b *unversionedapi.Time) bool {
return (a == nil) != (b == nil) || (a != nil && b != nil && *a != *b)
}
func differentPeriod(a, b *int64) bool {
return (a == nil) != (b == nil) || (a != nil && b != nil && *a != *b)
}