From 274c9976d24011c4bafae260aef7d75352893a14 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 3 Feb 2019 11:29:39 -0500 Subject: [PATCH] DefaultFailureDomains does not need to be global Change-Id: I5ccfe8b836133b0db402a37a6974fc011aa6335e --- pkg/kubelet/apis/well_known_labels.go | 4 ---- pkg/scheduler/apis/config/v1alpha1/BUILD | 2 +- pkg/scheduler/apis/config/v1alpha1/defaults.go | 8 ++++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/kubelet/apis/well_known_labels.go b/pkg/kubelet/apis/well_known_labels.go index bdc14c5130..b87c4bf7d3 100644 --- a/pkg/kubelet/apis/well_known_labels.go +++ b/pkg/kubelet/apis/well_known_labels.go @@ -31,10 +31,6 @@ const ( labelInstanceTypeGA = "kubernetes.io/instance-type" ) -// When the --failure-domains scheduler flag is not specified, -// DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. -var DefaultFailureDomains string = v1.LabelHostname + "," + v1.LabelZoneFailureDomain + "," + v1.LabelZoneRegion - var kubeletLabels = sets.NewString( v1.LabelHostname, v1.LabelZoneFailureDomain, diff --git a/pkg/scheduler/apis/config/v1alpha1/BUILD b/pkg/scheduler/apis/config/v1alpha1/BUILD index 1d778ff9f6..87559a2475 100644 --- a/pkg/scheduler/apis/config/v1alpha1/BUILD +++ b/pkg/scheduler/apis/config/v1alpha1/BUILD @@ -14,9 +14,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/core:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/scheduler/apis/config:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/pkg/scheduler/apis/config/v1alpha1/defaults.go b/pkg/scheduler/apis/config/v1alpha1/defaults.go index f6a08af34a..9fa898f544 100644 --- a/pkg/scheduler/apis/config/v1alpha1/defaults.go +++ b/pkg/scheduler/apis/config/v1alpha1/defaults.go @@ -20,16 +20,20 @@ import ( "net" "strconv" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1" kubescedulerconfigv1alpha1 "k8s.io/kube-scheduler/config/v1alpha1" // this package shouldn't really depend on other k8s.io/kubernetes code api "k8s.io/kubernetes/pkg/apis/core" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/master/ports" ) +// When the --failure-domains scheduler flag is not specified, +// DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. +var defaultFailureDomains string = v1.LabelHostname + "," + v1.LabelZoneFailureDomain + "," + v1.LabelZoneRegion + func addDefaultingFuncs(scheme *runtime.Scheme) error { return RegisterDefaults(scheme) } @@ -82,7 +86,7 @@ func SetDefaults_KubeSchedulerConfiguration(obj *kubescedulerconfigv1alpha1.Kube } if len(obj.FailureDomains) == 0 { - obj.FailureDomains = kubeletapis.DefaultFailureDomains + obj.FailureDomains = defaultFailureDomains } if len(obj.ClientConnection.ContentType) == 0 {