Merge pull request #7837 from jayunit100/cfg

OpenShift Bot · web-flow · commit ea6d630807c9 · 2016-06-14T11:58:46.000-04:00
Merged by openshift-bot
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -244,7 +244,7 @@ os::cmd::expect_success_and_text "cat ${MASTER_CONFIG_DIR}/master-config.yaml" '
 os::cmd::expect_success_and_text "cat ${BASETMPDIR}/atomic.local.config/master/master-config.yaml" 'disabledFeatures: null'
 
 # test client not configured
-os::cmd::expect_failure_and_text "oc get services" 'No configuration file found, please login'
+os::cmd::expect_failure_and_text "oc get services" 'Missing or incomplete configuration info.  Please login'
 unused_port="33333"
 # setting env bypasses the not configured message
 os::cmd::expect_failure_and_text "KUBERNETES_MASTER=http://${API_HOST}:${unused_port} oc get services" 'did you specify the right host or port'
diff --git a/pkg/cmd/util/clientcmd/factory.go b/pkg/cmd/util/clientcmd/factory.go
@@ -130,7 +130,7 @@ func (c defaultingClientConfig) ClientConfig() (*restclient.Config, error) {
 		return icc, nil
 	}
 
-	return nil, fmt.Errorf(`No configuration file found, please login or point to an existing file:
+	return nil, fmt.Errorf(`Missing or incomplete configuration info.  Please login or point to an existing, complete config file:
 
   1. Via the command-line flag --config
   2. Via the KUBECONFIG environment variable

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (c defaultingClientConfig) ClientConfig() (*restclient.Config, error) {`
`130`	`130`	`return icc, nil`
`131`	`131`	`}`
`132`	`132`
`133`		- return nil, fmt.Errorf(`No configuration file found, please login or point to an existing file:
	`133`	+ return nil, fmt.Errorf(`Missing or incomplete configuration info. Please login or point to an existing, complete config file:
`134`	`134`
`135`	`135`	`1. Via the command-line flag --config`
`136`	`136`	`2. Via the KUBECONFIG environment variable`