break dependencies on pkg/cmd/util/clientcmd

This patch is a part of pull/17356 - it aims to break all dependencies
between packages outside of `pkg/oc` and the `clientcmd` package.

To achieve this, this patch creates a new package containing only the
functions and objects found in `clientcmd` that are needed by its
dependents outside of the `pkg/oc` subtree. Once this is done, all of
the remaining logic (which should only be used by packages within
`pkg/oc` is moved to `pkg/oc/cli/util/clientcmd` by pull/17356).

This change acknowledges the possibility of having dependents for
`pkg/cmd/util/clientconfig` within the `pkg/oc` subtree.

Author: juanvallejo

pkg/client/cmd/clientcmd.go

@@ -0,0 +1,24 @@
+package clientconfig
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+)
+
+func EnvVars(host string, caData []byte, insecure bool, bearerTokenFile string) []api.EnvVar {
+	envvars := []api.EnvVar{
+		{Name: "KUBERNETES_MASTER", Value: host},
+		{Name: "OPENSHIFT_MASTER", Value: host},
+	}
+
+	if len(bearerTokenFile) > 0 {
+		envvars = append(envvars, api.EnvVar{Name: "BEARER_TOKEN_FILE", Value: bearerTokenFile})
+	}
+
+	if len(caData) > 0 {
+		envvars = append(envvars, api.EnvVar{Name: "OPENSHIFT_CA_DATA", Value: string(caData)})
+	} else if insecure {
+		envvars = append(envvars, api.EnvVar{Name: "OPENSHIFT_INSECURE", Value: "true"})
+	}
+
+	return envvars
+}

pkg/cmd/server/origin/controller/config.go

@@ -18,6 +18,25 @@ import (
 	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 )
 
+func envVars(host string, caData []byte, insecure bool, bearerTokenFile string) []kapi.EnvVar {
+	envvars := []kapi.EnvVar{
+		{Name: "KUBERNETES_MASTER", Value: host},
+		{Name: "OPENSHIFT_MASTER", Value: host},
+	}
+
+	if len(bearerTokenFile) > 0 {
+		envvars = append(envvars, kapi.EnvVar{Name: "BEARER_TOKEN_FILE", Value: bearerTokenFile})
+	}
+
+	if len(caData) > 0 {
+		envvars = append(envvars, kapi.EnvVar{Name: "OPENSHIFT_CA_DATA", Value: string(caData)})
+	} else if insecure {
+		envvars = append(envvars, kapi.EnvVar{Name: "OPENSHIFT_INSECURE", Value: "true"})
+	}
+
+	return envvars
+}
+
 func getOpenShiftClientEnvVars(options configapi.MasterConfig) ([]kapi.EnvVar, error) {
 	_, kclientConfig, err := configapi.GetInternalKubeClient(
 		options.MasterClients.OpenShiftLoopbackKubeConfig,
@@ -26,7 +45,7 @@ func getOpenShiftClientEnvVars(options configapi.MasterConfig) ([]kapi.EnvVar, e
 	if err != nil {
 		return nil, err
 	}
-	return clientcmd.EnvVars(
+	return envVars(
 		kclientConfig.Host,
 		kclientConfig.CAData,
 		kclientConfig.Insecure,

pkg/federation/kubefed/kubefed.go

@@ -13,8 +13,8 @@ import (
 	"k8s.io/kubernetes/federation/pkg/kubefed/util"
 	kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
 	"github.com/openshift/origin/pkg/version"
 )
 
@@ -51,7 +51,8 @@ func NewKubeFedCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	// Use an openshift command factory to ensure CmdNewVersion will work.
 	// It is interface compatible with the kube equivalent, so any calls to
 	// kube code will continue to work.
-	f := osclientcmd.New(cmds.PersistentFlags())
+	//f := osclientcmd.New(cmds.PersistentFlags())
+	f := kcmdutil.NewFactory(nil)
 
 	// From this point and forward we get warnings on flags that contain "_" separators
 	cmds.SetGlobalNormalizationFunc(flag.WarnWordSepNormalizeFunc)
@@ -73,7 +74,6 @@ func NewKubeFedCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	}
 	templates.ActsAsRootCommand(cmds, filters, groups...)
 
-	// Use the openshift-specific version command
 	cmds.AddCommand(kubectl.NewCmdOptions(out))
 
 	return cmds