@@ -465,7 +465,7 @@ func MakeRelative(path, base string) (string, error) {

 	return path, nil

 }

-// HomeDir return the home directory for the current user

+// HomeDir returns the home directory for the current user

 func HomeDir() string {

 	if runtime.GOOS == "windows" {

 		if homeDrive, homePath := os.Getenv("HOMEDRIVE"), os.Getenv("HOMEPATH"); len(homeDrive) > 0 && len(homePath) > 0 {

@@ -4,6 +4,7 @@ import (

 	"os"

 	"path"

 	"path/filepath"

+	"runtime"

 	"github.com/spf13/cobra"

@@ -21,27 +22,39 @@ const (

 	OpenShiftConfigHomeDirFileName = OpenShiftConfigHomeDir + "/" + OpenShiftConfigHomeFileName

 )

-var OldRecommendedHomeFile = path.Join(os.Getenv("HOME"), ".kube/.config")

-var RecommendedHomeFile = path.Join(os.Getenv("HOME"), OpenShiftConfigHomeDirFileName)

+var RecommendedHomeFile = path.Join(kclientcmd.HomeDir(), OpenShiftConfigHomeDirFileName)

+

+// currentMigrationRules returns a map that holds the history of recommended home directories used in previous versions.

+// Any future changes to RecommendedHomeFile and related are expected to add a migration rule here, in order to make

+// sure existing config files are migrated to their new locations properly.

+func currentMigrationRules() map[string]string {

+	oldRecommendedHomeFile := path.Join(kclientcmd.HomeDir(), ".kube/.config")

+	oldRecommendedWindowsHomeFile := path.Join(os.Getenv("HOME"), OpenShiftConfigHomeDirFileName)

+

+	migrationRules := map[string]string{}

+	migrationRules[RecommendedHomeFile] = oldRecommendedHomeFile

+	if runtime.GOOS == "windows" {

+		migrationRules[RecommendedHomeFile] = oldRecommendedWindowsHomeFile

+	}

+	return migrationRules

+}

 // NewOpenShiftClientConfigLoadingRules returns file priority loading rules for OpenShift.

 // 1. --config value

 // 2. if KUBECONFIG env var has a value, use it. Otherwise, ~/.kube/config file

 func NewOpenShiftClientConfigLoadingRules() *clientcmd.ClientConfigLoadingRules {

 	chain := []string{}

-	migrationRules := map[string]string{}

 	envVarFile := os.Getenv(OpenShiftConfigPathEnvVar)

 	if len(envVarFile) != 0 {

 		chain = append(chain, filepath.SplitList(envVarFile)...)

 	} else {

 		chain = append(chain, RecommendedHomeFile)

-		migrationRules[RecommendedHomeFile] = OldRecommendedHomeFile

 	}

 	return &clientcmd.ClientConfigLoadingRules{

 		Precedence:     chain,

-		MigrationRules: migrationRules,

+		MigrationRules: currentMigrationRules(),

 	}

 }