Update tests for lack of kubelet

Author: smarterclayton

hack/lib/start.sh

@@ -129,16 +129,14 @@ function os::start::internal::configure_master() {
 	openshift_executable="$(os::start::internal::openshift_executable "${version}")"
 
 	os::log::debug "Creating master configuration for the OpenShift server"
-	${openshift_executable} start                                                   \
+	${openshift_executable} start master                                            \
 	                        --create-certs=false                                    \
 	                        --images="${USE_IMAGES}"                                \
 	                        --master="${MASTER_ADDR}"                               \
-	                        --dns="tcp://${API_HOST}:53"                            \
-	                        --hostname="${KUBELET_HOST}"                            \
-	                        --volume-dir="${VOLUME_DIR}"                            \
+	                        --dns="tcp://${API_HOST}:8053"                          \
 	                        --etcd-dir="${ETCD_DATA_DIR}"                           \
 	                        --network-plugin="${NETWORK_PLUGIN:-}"                  \
-	                        --write-config="${SERVER_CONFIG_DIR}"                   \
+	                        --write-config="${SERVER_CONFIG_DIR}/master"            \
 	                        --listen="${API_SCHEME}://${API_BIND_HOST}:${API_PORT}" \
 	                        --public-master="${API_SCHEME}://${PUBLIC_MASTER_HOST}:${API_PORT}"
 

pkg/cmd/server/start/start_network.go

@@ -183,6 +183,9 @@ func (o NodeOptions) RunNetwork() error {
 // After this call returns without an error, config files will exist on disk. It also returns
 // a string for messages indicating which config file contains the config.
 func (o NodeOptions) resolveNodeConfig() (*configapi.NodeConfig, string, error) {
+	if len(o.ConfigFile) == 0 {
+		return nil, "", fmt.Errorf("you must specify a configuration file with --config")
+	}
 	glog.V(2).Infof("Reading node configuration from %s", o.ConfigFile)
 	cfg, err := configapilatest.ReadAndResolveNodeConfig(o.ConfigFile)
 	return cfg, o.ConfigFile, err

pkg/oc/clusterup/coreinstall/kubelet/flags.go

@@ -36,8 +36,6 @@ func (opt KubeletStartFlags) MakeKubeletFlags(dockerClient dockerhelper.Interfac
 	}
 
 	createFlagsCmd := []string{
-		"start", "node",
-		"--write-flags",
 		"--config=/var/lib/origin/openshift.local.config/node/node-config.yaml",
 	}
 
@@ -46,7 +44,7 @@ func (opt KubeletStartFlags) MakeKubeletFlags(dockerClient dockerhelper.Interfac
 		Bind(binds...).
 		Env(env...).
 		SaveContainerLogs(componentName, path.Join(basedir, "logs")).
-		Entrypoint("openshift").
+		Entrypoint("openshift-node-config").
 		Command(createFlagsCmd...).Output()
 	if err != nil {
 		return "", errors.NewError("could not run %q: %v", componentName, err).WithCause(err)

test/cmd/admin.sh

@@ -32,12 +32,11 @@ os::test::junit::declare_suite_start "cmd/admin"
 
 os::test::junit::declare_suite_start "cmd/admin/start"
 # Check failure modes of various system commands
-os::cmd::expect_failure_and_text 'openshift start network' 'kubeconfig must be set'
+os::cmd::expect_failure_and_text 'openshift start network' 'you must specify a configuration file with --config'
 os::cmd::expect_failure_and_text 'openshift start network --config=${NODECONFIG} --enable=kubelet' 'the following components are not recognized: kubelet'
 os::cmd::expect_failure_and_text 'openshift start network --config=${NODECONFIG} --enable=kubelet,other' 'the following components are not recognized: kubelet, other'
 os::cmd::expect_failure_and_text 'openshift start network --config=${NODECONFIG} --disable=other' 'the following components are not recognized: other'
 os::cmd::expect_failure_and_text 'openshift start network --config=${NODECONFIG} --disable=dns,proxy,plugins' 'at least one node component must be enabled \(dns, plugins, proxy\)'
-os::cmd::expect_failure_and_text 'openshift start --write-config=/tmp/test --hostname=""' 'error: --hostname must have a value'
 os::test::junit::declare_suite_end
 
 os::test::junit::declare_suite_start "cmd/admin/manage-node"

test/cmd/help.sh

@@ -41,18 +41,18 @@ os::cmd::expect_success_and_text 'oc login --help' 'insecure-skip-tls-verify'
 
 # help for given command with --help flag must be consistent
 os::cmd::expect_success_and_text 'oc get --help' 'Display one or many resources'
-os::cmd::expect_success_and_text 'openshift start --help' 'Launch OpenShift components'
+os::cmd::expect_success_and_text 'openshift start --help' 'Start components of OpenShift'
 os::cmd::expect_success_and_text 'openshift start master --help' 'Start a master'
-os::cmd::expect_success_and_text 'openshift start network --help' 'Start networking'
+os::cmd::expect_success_and_text 'openshift start network --help' 'Start node network'
 os::cmd::expect_success_and_text 'oc project --help' 'Switch to another project'
 os::cmd::expect_success_and_text 'oc projects --help' 'existing projects'
 os::cmd::expect_success_and_text 'oc get --help' 'oc'
 
 # help for given command through help command must be consistent
 os::cmd::expect_success_and_text 'oc help get' 'Display one or many resources'
-os::cmd::expect_success_and_text 'openshift help start' 'Launch OpenShift components'
+os::cmd::expect_success_and_text 'openshift help start' 'Start components of OpenShift'
 os::cmd::expect_success_and_text 'openshift help start master' 'Start a master'
-os::cmd::expect_success_and_text 'openshift help start node' 'Start a node'
+os::cmd::expect_success_and_text 'openshift help start network' 'Start node network'
 os::cmd::expect_success_and_text 'oc help project' 'Switch to another project'
 os::cmd::expect_success_and_text 'oc help projects' 'current active project and existing projects on the server'
 

test/util/server/server.go

@@ -37,7 +37,6 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/etcd"
 	"github.com/openshift/origin/pkg/cmd/server/start"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	utilflags "github.com/openshift/origin/pkg/cmd/util/flags"
 	newproject "github.com/openshift/origin/pkg/oc/cli/admin/project"
 	projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
 	"github.com/openshift/origin/test/util"
@@ -320,26 +319,6 @@ func CleanupMasterEtcd(t *testing.T, config *configapi.MasterConfig) {
 	}
 }
 
-func StartConfiguredNode(nodeConfig *configapi.NodeConfig, components *utilflags.ComponentFlag) error {
-	guardNode()
-
-	_, nodePort, err := net.SplitHostPort(nodeConfig.ServingInfo.BindAddress)
-	if err != nil {
-		return err
-	}
-
-	if err := start.StartNode(*nodeConfig, components); err != nil {
-		return err
-	}
-
-	// wait for the server to come up for 30 seconds (average time on desktop is 2 seconds, but Jenkins timed out at 10 seconds)
-	if err := cmdutil.WaitForSuccessfulDial(true, "tcp", net.JoinHostPort(nodeConfig.NodeName, nodePort), 100*time.Millisecond, 1*time.Second, 30); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func StartConfiguredMaster(masterConfig *configapi.MasterConfig) (string, error) {
 	return StartConfiguredMasterWithOptions(masterConfig)
 }