Merge pull request #4733 from justinsb/int_validation_fix_2

Validation: clean up unused node status functions
kubernetes · Mar 20, 2018 · 963eb0d · 963eb0d
2 parents 9ef240d + 1b0f5a4
commit 963eb0d
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 350 deletions.
diff --git a/cmd/kops/validate_cluster.go b/cmd/kops/validate_cluster.go
@@ -232,7 +232,7 @@ func validateClusterOutputTable(validationCluster *validation.ValidationCluster,
 	})
 
 	nodeTable.AddColumn("READY", func(n v1.Node) v1.ConditionStatus {
-		return validation.GetNodeConditionStatus(&n)
+		return validation.GetNodeReadyStatus(&n)
 	})
 
 	nodeTable.AddColumn("ROLE", func(n v1.Node) string {

diff --git a/pkg/validation/BUILD.bazel b/pkg/validation/BUILD.bazel
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
-        "node_api_adapter.go",
+        "node_conditions.go",
         "validate_cluster.go",
     ],
     importpath = "k8s.io/kops/pkg/validation",
@@ -14,7 +14,6 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
     ],
@@ -23,7 +22,6 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
-        "node_api_adapter_test.go",
         "validate_cluster_test.go",
     ],
     embed = [":go_default_library"],

diff --git a/pkg/validation/node_api_adapter.go b/pkg/validation/node_api_adapter.go
diff --git a/pkg/validation/node_api_adapter_test.go b/pkg/validation/node_api_adapter_test.go