From f5550fd8bdf162abaaa1baa2f0f5b7f7258f3137 Mon Sep 17 00:00:00 2001
From: Liz Rice <liz@lizrice.com>
Date: Thu, 31 Aug 2017 14:43:35 +0100
Subject: [PATCH] Node type is now verified by looking for running binaries
from a set of options
---
cmd/common.go | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/cmd/common.go b/cmd/common.go
index 51ffda2..33c0a03 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -74,7 +74,6 @@ func runChecks(t check.NodeType) {
// Run kubernetes installation validation checks.
verifyKubeVersion(kubeMajorVersion, kubeMinorVersion)
- verifyNodeType(t)
switch t {
case check.MASTER:
@@ -126,41 +125,6 @@ func runChecks(t check.NodeType) {
}
}
-// verifyNodeType checks the executables and config files are as expected
-// for the specified tests (master, node or federated).
-func verifyNodeType(t check.NodeType) {
- var bins []string
- var confs []string
-
- switch t {
- case check.MASTER:
- bins = []string{apiserverBin, schedulerBin, controllerManagerBin}
- confs = []string{apiserverConf, schedulerConf, controllerManagerConf}
- case check.NODE:
- bins = []string{kubeletBin, proxyBin}
- confs = []string{kubeletConf, proxyConf}
- case check.FEDERATED:
- bins = []string{fedApiserverBin, fedControllerManagerBin}
- }
-
- for _, bin := range bins {
- if !verifyBin(bin) {
- printlnWarn(fmt.Sprintf("%s is not running", bin))
- }
- }
-
- for _, conf := range confs {
- _, err := os.Stat(conf)
- if err != nil {
- if os.IsNotExist(err) {
- printlnWarn(fmt.Sprintf("Missing kubernetes config file: %s", conf))
- } else {
- exitWithError(fmt.Errorf("error looking for file %s: %v", conf, err))
- }
- }
- }
-}
-
// colorPrint outputs the state in a specific colour, along with a message string
func colorPrint(state check.State, s string) {
colors[state].Printf("[%s] ", state)
--
GitLab