
This commit includes the fundamental components of the Kubernetes Mesos integration: * Kubernetes-Mesos scheduler * Kubernetes-Mesos executor * Supporting libs Dependencies and upstream changes are included in a separate commit for easy review. After this initial upstream, there'll be two PRs following. * km (hypercube) and k8sm-controller-manager #9265 * Static pods support #9077 Fixes applied: - Precise metrics subsystems definitions - mesosphere/kubernetes-mesos#331 - https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion_r31875232 - https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion_r31875240 - Improve comments and add clarifications - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875208 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875226 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875227 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875228 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875239 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875243 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875234 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875256 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875255 - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875251 - Clarify which Schedule function is actually called - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875246
81 lines
1.9 KiB
Go
81 lines
1.9 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package scheduler
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"
|
|
)
|
|
|
|
// wrapper for the k8s pod type so that we can define additional methods on a "pod"
|
|
type Pod struct {
|
|
*api.Pod
|
|
deadline *time.Time
|
|
delay *time.Duration
|
|
notify queue.BreakChan
|
|
}
|
|
|
|
// implements Copyable
|
|
func (p *Pod) Copy() queue.Copyable {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
//TODO(jdef) we may need a better "deep-copy" implementation
|
|
pod := *(p.Pod)
|
|
return &Pod{Pod: &pod}
|
|
}
|
|
|
|
// implements Unique
|
|
func (p *Pod) GetUID() string {
|
|
if id, err := cache.MetaNamespaceKeyFunc(p.Pod); err != nil {
|
|
panic(fmt.Sprintf("failed to determine pod id for '%+v'", p.Pod))
|
|
} else {
|
|
return id
|
|
}
|
|
}
|
|
|
|
// implements Deadlined
|
|
func (dp *Pod) Deadline() (time.Time, bool) {
|
|
if dp.deadline != nil {
|
|
return *(dp.deadline), true
|
|
}
|
|
return time.Time{}, false
|
|
}
|
|
|
|
func (dp *Pod) GetDelay() time.Duration {
|
|
if dp.delay != nil {
|
|
return *(dp.delay)
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (p *Pod) Breaker() queue.BreakChan {
|
|
return p.notify
|
|
}
|
|
|
|
func (p *Pod) String() string {
|
|
displayDeadline := "<none>"
|
|
if deadline, ok := p.Deadline(); ok {
|
|
displayDeadline = deadline.String()
|
|
}
|
|
return fmt.Sprintf("{pod:%v, deadline:%v, delay:%v}", p.Pod.Name, displayDeadline, p.GetDelay())
|
|
}
|