From 800eb07b27fd5c712e1cd3c4c5799ce2155ac42d Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 8 Jun 2017 15:38:22 -0700 Subject: [PATCH] revert before merge? remove a dependency from pkg/apis/componentconfig to clientset, probably we should fix it later. i removed the dependency to test if pkg/apis compile --- pkg/apis/componentconfig/v1alpha1/defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 7d02dff118f..4c7d6175ccc 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -26,7 +26,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" @@ -187,7 +186,8 @@ func SetDefaults_LeaderElectionConfiguration(obj *LeaderElectionConfiguration) { obj.RetryPeriod = metav1.Duration{Duration: 2 * time.Second} } if obj.ResourceLock == "" { - obj.ResourceLock = rl.EndpointsResourceLock + // obj.ResourceLock = rl.EndpointsResourceLock + obj.ResourceLock = "endpoints" } }