From 98aceecbfb39c2819eca4429aa2a6a30d708137e Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 20 Jan 2017 15:19:41 +0000 Subject: [PATCH] published by bot (https://github.com/kubernetes/contrib/tree/master/mungegithub) copied from https://github.com/kubernetes/kubernetes.git, branch master, last commit is 4f8f6006cf17a3189fbd51a83fe3864d247d6796 --- pkg/api/OWNERS | 2 -- pkg/apis/componentconfig/types.go | 3 +-- pkg/apis/componentconfig/v1alpha1/types.go | 3 +-- vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/api/OWNERS b/pkg/api/OWNERS index 569ba5b5..3a9b0c6d 100644 --- a/pkg/api/OWNERS +++ b/pkg/api/OWNERS @@ -1,5 +1,4 @@ approvers: -- bgrant0607 - erictune - lavalamp - smarterclayton @@ -9,7 +8,6 @@ reviewers: - lavalamp - smarterclayton - wojtek-t -- bgrant0607 - deads2k - yujuhong - brendandburns diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 4bba16ba..0a39e082 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -561,8 +561,7 @@ type KubeSchedulerConfiguration struct { // kubeAPIBurst is the QPS burst to use while talking with kubernetes apiserver. KubeAPIBurst int32 // schedulerName is name of the scheduler, used to select which pods - // will be processed by this scheduler, based on pod's annotation with - // key 'scheduler.alpha.kubernetes.io/name'. + // will be processed by this scheduler, based on pod's "spec.SchedulerName". SchedulerName string // RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule // corresponding to every RequiredDuringScheduling affinity rule. diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 2b5281d9..fac5c0c0 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -122,8 +122,7 @@ type KubeSchedulerConfiguration struct { // kubeAPIBurst is the QPS burst to use while talking with kubernetes apiserver. KubeAPIBurst int `json:"kubeAPIBurst"` // schedulerName is name of the scheduler, used to select which pods - // will be processed by this scheduler, based on pod's annotation with - // key 'scheduler.alpha.kubernetes.io/name'. + // will be processed by this scheduler, based on pod's "spec.SchedulerName". SchedulerName string `json:"schedulerName"` // RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule // corresponding to every RequiredDuringScheduling affinity rule. diff --git a/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS b/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS index 155e203d..ae828ad2 100755 --- a/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS +++ b/vendor/k8s.io/apimachinery/pkg/api/errors/OWNERS @@ -3,7 +3,6 @@ reviewers: - lavalamp - smarterclayton - wojtek-t -- bgrant0607 - deads2k - brendandburns - derekwaynecarr