Merge pull request #1755 from deads2k/deads-start-simplifying-loading

Merged by openshift-bot

Author: OpenShift Bot

Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/config/config.go

@@ -32,8 +32,8 @@ Once it is pulled it will start and be visible in the `docker ps` list of contai
     [vagrant@openshiftdev origin]$ sudo /data/src/github.com/openshift/origin/_output/local/bin/linux/amd64/openshift start &
 
     If running in https mode, ensure osc can authenticate to the master
-    [vagrant@openshiftdev origin]$ export KUBECONFIG=/data/src/github.com/openshift/origin/openshift.local.certificates/admin/.kubeconfig
-    [vagrant@openshiftdev origin]$ sudo chmod a+r "$KUBECONFIG"
+    [vagrant@openshiftdev origin]$ export OPENSHIFTCONFIG=/data/src/github.com/openshift/origin/openshift.local.certificates/admin/.kubeconfig
+    [vagrant@openshiftdev origin]$ sudo chmod a+r "$OPENSHIFTCONFIG"
     [vagrant@openshiftdev origin]$ sudo chmod a+r openshift.local.certificates/openshift-router/.kubeconfig
     [vagrant@openshiftdev origin]$ openshift ex router --create --credentials="openshift.local.certificates/openshift-router/.kubeconfig"
     [vagrant@openshiftdev origin]$ osc get pods
@@ -44,7 +44,7 @@ Once it is pulled it will start and be visible in the `docker ps` list of contai
     $ export OPENSHIFT_DEV_CLUSTER=true
     $ vagrant up
     $ vagrant ssh master
-    [vagrant@openshift-master ~]$ openshift ex router --create --credentials="${KUBECONFIG}"
+    [vagrant@openshift-master ~]$ openshift ex router --create --credentials="${OPENSHIFTCONFIG}"
 
 
 

docs/routing.md

@@ -40,8 +40,8 @@ users:
   <builders>
     <hudson.tasks.Shell>
       <command>
-export KUBECONFIG=.kubeconfig
-echo "${KUBECONFIG_CREDENTIALS}" > "${KUBECONFIG}"
+export OPENSHIFTCONFIG=.kubeconfig
+echo "${KUBECONFIG_CREDENTIALS}" > "${OPENSHIFTCONFIG}"
 
 TEST_ENDPOINT=`osc get services -n test | grep frontend-test | awk '{print $4":"$5}'`
 

examples/jenkins/job.xml

@@ -68,7 +68,7 @@ step #3.
 
 ## Deploy the private docker registry
 
-    $ openshift ex registry --create --credentials="${KUBECONFIG}"
+    $ openshift ex registry --create --credentials="${OPENSHIFTCONFIG}"
     $ cd examples/sample-app
 
 For more information on this step, see [Application Build, Deploy, and Update

examples/sample-app/container-setup.md

@@ -32,7 +32,6 @@ trap "cleanup" EXIT
 set -e
 
 # Prevent user environment from colliding with the test setup
-unset KUBECONFIG
 unset OPENSHIFTCONFIG
 
 USE_LOCAL_IMAGES=${USE_LOCAL_IMAGES:-true}
@@ -157,23 +156,17 @@ osc get services --config="${CERT_DIR}/admin/.kubeconfig"
 
 # test config files from env vars
 OPENSHIFTCONFIG="${CERT_DIR}/admin/.kubeconfig" osc get services
-KUBECONFIG="${CERT_DIR}/admin/.kubeconfig" osc get services
 
 # test config files in the current directory
 TEMP_PWD=`pwd` 
 pushd ${CONFIG_DIR} >/dev/null
     cp ${CERT_DIR}/admin/.kubeconfig .openshiftconfig
     ${TEMP_PWD}/${GO_OUT}/osc get services
-    mv .openshiftconfig .kubeconfig 
-    ${TEMP_PWD}/${GO_OUT}/osc get services
 popd 
 
 # test config files in the home directory
-mv ${CONFIG_DIR} ${HOME}/.kube
-osc get services
-mkdir -p ${HOME}/.config
-mv ${HOME}/.kube ${HOME}/.config/openshift
-mv ${HOME}/.config/openshift/.kubeconfig ${HOME}/.config/openshift/.config
+mkdir -p ${HOME}/.config/openshift
+mv ${CONFIG_DIR}/.openshiftconfig ${HOME}/.config/openshift/.config
 osc get services
 echo "config files: ok"
 export OPENSHIFTCONFIG="${HOME}/.config/openshift/.config"

hack/test-cmd.sh

@@ -33,7 +33,7 @@ export CERT_DIR="${BASETMPDIR}/cert"
 export CURL_CA_BUNDLE="${CERT_DIR}/ca/cert.crt"
 export CURL_CERT="${CERT_DIR}/admin/cert.crt"
 export CURL_KEY="${CERT_DIR}/admin/key.key"
-export KUBECONFIG="${CERT_DIR}/admin/.kubeconfig"
+export OPENSHIFTCONFIG="${CERT_DIR}/admin/.kubeconfig"
 export OPENSHIFT_ON_PANIC=crash
 
 cleanup() {
@@ -96,11 +96,11 @@ start_server() {
 start_docker_registry() {
   mkdir -p ${BASETMPDIR}/.registry
   echo "[INFO] Creating Router ..."
-  openshift ex router --create --credentials="${KUBECONFIG}" \
+  openshift ex router --create --credentials="${OPENSHIFTCONFIG}" \
     --images='openshift/origin-${component}:latest' &>/dev/null
 
   echo "[INFO] Creating Registry ..."
-  openshift ex registry --create --credentials="${KUBECONFIG}" \
+  openshift ex registry --create --credentials="${OPENSHIFTCONFIG}" \
     --mount-host="${BASETMPDIR}/.registry" \
     --images='openshift/origin-${component}:latest' &>/dev/null
 }

hack/test-extended.sh

@@ -16,6 +16,6 @@ RUN ln -s /usr/bin/openshift /usr/bin/osc && \
     ln -s /usr/bin/openshift /usr/bin/openshift-router
 
 ENV HOME /root
-ENV KUBECONFIG /var/lib/openshift/openshift.local.certificates/admin/.kubeconfig
+ENV OPENSHIFTCONFIG /var/lib/openshift/openshift.local.certificates/admin/.kubeconfig
 WORKDIR /var/lib/openshift
 ENTRYPOINT ["/usr/bin/openshift"]

images/origin/Dockerfile

@@ -81,14 +81,12 @@ func RunLogin(cmd *cobra.Command, options *LoginOptions) error {
 	if keyFile := cmdutil.GetFlagString(cmd, "client-key"); len(keyFile) > 0 {
 		options.KeyFile = keyFile
 	}
+	options.PathToSaveConfig = cmdutil.GetFlagString(cmd, config.OpenShiftConfigFlagName)
 
 	if err := options.GatherInfo(); err != nil {
 		return err
 	}
 
-	forcePath := cmdutil.GetFlagString(cmd, config.OpenShiftConfigFlagName)
-	options.PathToSaveConfig = forcePath
-
 	newFileCreated, err := options.SaveConfig()
 	if err != nil {
 		return err