Remove deprecated fields from kubescheduler.config.k8s.io/v1alpha2

Signed-off-by: Aldo Culquicondor <[email protected]>
kubernetes · Feb 6, 2020 · 1071eb8 · 1071eb8
1 parent 6858c25
commit 1071eb8
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 303 deletions.
diff --git a/pkg/scheduler/apis/config/v1alpha2/BUILD b/pkg/scheduler/apis/config/v1alpha2/BUILD
@@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
-        "conversion.go",
         "defaults.go",
         "doc.go",
         "register.go",
@@ -27,16 +26,10 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "conversion_test.go",
-        "defaults_test.go",
-    ],
+    srcs = ["defaults_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/scheduler/apis/config:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library",
-        "//staging/src/k8s.io/component-base/config:go_default_library",
         "//staging/src/k8s.io/component-base/config/v1alpha1:go_default_library",
         "//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",

diff --git a/pkg/scheduler/apis/config/v1alpha2/conversion.go b/pkg/scheduler/apis/config/v1alpha2/conversion.go
diff --git a/pkg/scheduler/apis/config/v1alpha2/conversion_test.go b/pkg/scheduler/apis/config/v1alpha2/conversion_test.go
diff --git a/pkg/scheduler/apis/config/v1alpha2/defaults.go b/pkg/scheduler/apis/config/v1alpha2/defaults.go
@@ -121,11 +121,11 @@ func SetDefaults_KubeSchedulerConfiguration(obj *v1alpha2.KubeSchedulerConfigura
 	if len(obj.LeaderElection.ResourceLock) == 0 {
 		obj.LeaderElection.ResourceLock = "endpointsleases"
 	}
-	if len(obj.LeaderElection.LockObjectNamespace) == 0 && len(obj.LeaderElection.ResourceNamespace) == 0 {
-		obj.LeaderElection.LockObjectNamespace = v1alpha2.SchedulerDefaultLockObjectNamespace
+	if len(obj.LeaderElection.ResourceNamespace) == 0 {
+		obj.LeaderElection.ResourceNamespace = v1alpha2.SchedulerDefaultLockObjectNamespace
 	}
-	if len(obj.LeaderElection.LockObjectName) == 0 && len(obj.LeaderElection.ResourceName) == 0 {
-		obj.LeaderElection.LockObjectName = v1alpha2.SchedulerDefaultLockObjectName
+	if len(obj.LeaderElection.ResourceName) == 0 {
+		obj.LeaderElection.ResourceName = v1alpha2.SchedulerDefaultLockObjectName
 	}
 
 	if len(obj.ClientConnection.ContentType) == 0 {

diff --git a/pkg/scheduler/apis/config/v1alpha2/defaults_test.go b/pkg/scheduler/apis/config/v1alpha2/defaults_test.go
@@ -54,11 +54,9 @@ func TestSchedulerDefaults(t *testing.T) {
 						RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
 						RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
 						ResourceLock:      "endpointsleases",
-						ResourceNamespace: "",
-						ResourceName:      "",
+						ResourceNamespace: "kube-system",
+						ResourceName:      "kube-scheduler",
 					},
-					LockObjectName:      "kube-scheduler",
-					LockObjectNamespace: "kube-system",
 				},
 				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
 					QPS:         50,
@@ -96,11 +94,9 @@ func TestSchedulerDefaults(t *testing.T) {
 						RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
 						RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
 						ResourceLock:      "endpointsleases",
-						ResourceNamespace: "",
-						ResourceName:      "",
+						ResourceNamespace: "kube-system",
+						ResourceName:      "kube-scheduler",
 					},
-					LockObjectName:      "kube-scheduler",
-					LockObjectNamespace: "kube-system",
 				},
 				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
 					QPS:         50,
@@ -138,11 +134,9 @@ func TestSchedulerDefaults(t *testing.T) {
 						RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
 						RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
 						ResourceLock:      "endpointsleases",
-						ResourceNamespace: "",
-						ResourceName:      "",
+						ResourceNamespace: "kube-system",
+						ResourceName:      "kube-scheduler",
 					},
-					LockObjectName:      "kube-scheduler",
-					LockObjectNamespace: "kube-system",
 				},
 				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
 					QPS:         50,