begin externalizing newapp, newbuild

Author: juanvallejo

pkg/oc/cli/admin/ipfailover/keepalived/generator.go

@@ -6,6 +6,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 
 	dapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	"github.com/openshift/origin/pkg/oc/cli/admin/ipfailover/ipfailover"
@@ -76,6 +77,18 @@ func generateFailoverMonitorContainerConfig(name string, options *ipfailover.IPF
 		},
 	}
 
+	// TODO: remove this once this command is switched over to external versions
+	internalEnvVar := []kapi.EnvVar{}
+	for _, e := range env.List() {
+		internal := &kapi.EnvVar{}
+		err := kapiv1.Convert_v1_EnvVar_To_core_EnvVar(&e, internal, nil)
+		if err != nil {
+			continue
+		}
+
+		internalEnvVar = append(internalEnvVar, *internal)
+	}
+
 	privileged := true
 	return &kapi.Container{
 		Name:  containerName,
@@ -86,7 +99,7 @@ func generateFailoverMonitorContainerConfig(name string, options *ipfailover.IPF
 		},
 		ImagePullPolicy: kapi.PullIfNotPresent,
 		VolumeMounts:    mounts,
-		Env:             env.List(),
+		Env:             internalEnvVar,
 		LivenessProbe:   livenessProbe,
 	}
 }

pkg/oc/cli/admin/registry/registry.go

@@ -20,6 +20,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
@@ -378,6 +379,18 @@ func (opts *RegistryOptions) RunCmdRegistry() error {
 	livenessProbe := generateLivenessProbeConfig(healthzPort, tls)
 	readinessProbe := generateReadinessProbeConfig(healthzPort, tls)
 
+	// TODO: remove this once this command is switched over to external versions
+	internalEnvVar := []kapi.EnvVar{}
+	for _, e := range env.List() {
+		internal := &kapi.EnvVar{}
+		err := kapiv1.Convert_v1_EnvVar_To_core_EnvVar(&e, internal, nil)
+		if err != nil {
+			continue
+		}
+
+		internalEnvVar = append(internalEnvVar, *internal)
+	}
+
 	mountHost := len(opts.Config.HostMount) > 0
 	podTemplate := &kapi.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{Labels: opts.label},
@@ -388,7 +401,7 @@ func (opts *RegistryOptions) RunCmdRegistry() error {
 					Name:  "registry",
 					Image: opts.image,
 					Ports: opts.ports,
-					Env:   env.List(),
+					Env:   internalEnvVar,
 					VolumeMounts: append(mounts, kapi.VolumeMount{
 						Name:      "registry-storage",
 						MountPath: opts.Config.Volume,

pkg/oc/cli/admin/router/router.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@@ -884,6 +885,18 @@ func RunCmdRouter(f kcmdutil.Factory, cmd *cobra.Command, out, errout io.Writer,
 	livenessProbe := generateLivenessProbeConfig(cfg, ports)
 	readinessProbe := generateReadinessProbeConfig(cfg, ports)
 
+	// TODO: remove this once this command is switched over to external versions
+	internalEnvVar := []kapi.EnvVar{}
+	for _, e := range env.List() {
+		internal := &kapi.EnvVar{}
+		err := kapiv1.Convert_v1_EnvVar_To_core_EnvVar(&e, internal, nil)
+		if err != nil {
+			continue
+		}
+
+		internalEnvVar = append(internalEnvVar, *internal)
+	}
+
 	exposedPorts := make([]kapi.ContainerPort, len(ports))
 	copy(exposedPorts, ports)
 	if !cfg.HostPorts {
@@ -896,7 +909,7 @@ func RunCmdRouter(f kcmdutil.Factory, cmd *cobra.Command, out, errout io.Writer,
 			Name:            "router",
 			Image:           image,
 			Ports:           exposedPorts,
-			Env:             env.List(),
+			Env:             internalEnvVar,
 			LivenessProbe:   livenessProbe,
 			ReadinessProbe:  readinessProbe,
 			ImagePullPolicy: kapi.PullIfNotPresent,

pkg/oc/cli/debug/debug.go

@@ -25,7 +25,6 @@ import (
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
-	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	"k8s.io/kubernetes/pkg/kubectl"
 	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
@@ -45,7 +44,7 @@ import (
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageutil "github.com/openshift/origin/pkg/image/util"
-	conditions "github.com/openshift/origin/pkg/oc/lib/conditions"
+	"github.com/openshift/origin/pkg/oc/lib/conditions"
 	generateapp "github.com/openshift/origin/pkg/oc/lib/newapp/app"
 	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
@@ -255,23 +254,11 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s
 
 	o.Builder = f.NewBuilder
 
-	internalAddEnv, removeEnv, err := utilenv.ParseEnv(envArgs, nil)
+	o.AddEnv, o.RemoveEnv, err = utilenv.ParseEnv(envArgs, nil)
 	if err != nil {
 		return err
 	}
 
-	// convert EnvVars that we should add, from internal to external
-	for _, internal := range internalAddEnv {
-		external := corev1.EnvVar{}
-		if err := kapiv1.Convert_core_EnvVar_To_v1_EnvVar(&internal, &external, nil); err != nil {
-			return err
-		}
-
-		o.AddEnv = append(o.AddEnv, external)
-	}
-
-	o.RemoveEnv = removeEnv
-
 	cmdParent := cmd.Parent()
 	if cmdParent != nil && len(cmdParent.CommandPath()) > 0 && kcmdutil.IsSiblingCommandExists(cmd, "describe") {
 		o.FullCmdName = cmdParent.CommandPath()

pkg/oc/cli/set/deploymenthook.go

@@ -6,12 +6,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@@ -415,11 +413,7 @@ func (o *DeploymentHookOptions) lifecycleHook(dc *appsv1.DeploymentConfig) (*app
 			return nil, err
 		}
 		for i := range env {
-			var versionedEnv corev1.EnvVar
-			if err := legacyscheme.Scheme.Convert(&env[i], &versionedEnv, nil); err != nil {
-				return nil, err
-			}
-			hook.ExecNewPod.Env = append(hook.ExecNewPod.Env, versionedEnv)
+			hook.ExecNewPod.Env = append(hook.ExecNewPod.Env, env[i])
 		}
 	}
 	if len(o.Volumes) > 0 {

pkg/oc/cli/set/env.go

@@ -17,9 +17,7 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
-	kinternalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@@ -30,9 +28,8 @@ import (
 
 	buildv1 "github.com/openshift/api/build/v1"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/oc/util/clientcmd"
+	envresolve "github.com/openshift/origin/pkg/oc/lib/env"
 	utilenv "github.com/openshift/origin/pkg/oc/util/env"
-	envresolve "github.com/openshift/origin/pkg/pod/envresolve"
 )
 
 var (
@@ -108,7 +105,7 @@ type EnvOptions struct {
 	Encoder                runtime.Encoder
 	Mapper                 meta.RESTMapper
 	Client                 dynamic.Interface
-	KubeClient             kinternalclientset.Interface
+	KClientSet             kubernetes.Interface
 	Printer                printers.ResourcePrinter
 	Namespace              string
 	ExplicitNamespace      bool
@@ -160,7 +157,7 @@ func NewCmdEnv(fullName string, f kcmdutil.Factory, streams genericclioptions.IO
 	return cmd
 }
 
-func validateNoOverwrites(existing []kapi.EnvVar, env []kapi.EnvVar) error {
+func validateNoOverwrites(existing []corev1.EnvVar, env []corev1.EnvVar) error {
 	for _, e := range env {
 		if current, exists := findEnv(existing, e.Name); exists && current.Value != e.Value {
 			return fmt.Errorf("'%s' already has a value (%s), and --overwrite is false", current.Name, current.Value)
@@ -184,8 +181,12 @@ func (o *EnvOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []str
 		return kcmdutil.UsageErrorf(cmd, "one or more resources must be specified as <resource> <name> or <resource>/<name>")
 	}
 
-	var err error
-	o.KubeClient, err = f.ClientSet()
+	config, err := f.ToRESTConfig()
+	if err != nil {
+		return err
+	}
+
+	o.KClientSet, err = kubernetes.NewForConfig(config)
 	if err != nil {
 		return err
 	}
@@ -260,11 +261,11 @@ func (o *EnvOptions) RunEnv() error {
 			switch from := info.Object.(type) {
 			case *corev1.Secret:
 				for key := range from.Data {
-					envVar := kapi.EnvVar{
+					envVar := corev1.EnvVar{
 						Name: keyToEnvName(key),
-						ValueFrom: &kapi.EnvVarSource{
-							SecretKeyRef: &kapi.SecretKeySelector{
-								LocalObjectReference: kapi.LocalObjectReference{
+						ValueFrom: &corev1.EnvVarSource{
+							SecretKeyRef: &corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{
 									Name: from.Name,
 								},
 								Key: key,
@@ -275,11 +276,11 @@ func (o *EnvOptions) RunEnv() error {
 				}
 			case *corev1.ConfigMap:
 				for key := range from.Data {
-					envVar := kapi.EnvVar{
+					envVar := corev1.EnvVar{
 						Name: keyToEnvName(key),
-						ValueFrom: &kapi.EnvVarSource{
-							ConfigMapKeyRef: &kapi.ConfigMapKeySelector{
-								LocalObjectReference: kapi.LocalObjectReference{
+						ValueFrom: &corev1.EnvVarSource{
+							ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{
 									Name: from.Name,
 								},
 								Key: key,
@@ -342,9 +343,9 @@ func (o *EnvOptions) RunEnv() error {
 	errored := []*resource.Info{}
 	for _, info := range infos {
 		name := getObjectName(info)
-		ok, err := o.UpdatePodSpecForObject(info.Object, clientcmd.ConvertInteralPodSpecToExternal(func(spec *kapi.PodSpec) error {
+		ok, err := o.UpdatePodSpecForObject(info.Object, func(spec *corev1.PodSpec) error {
 			resolutionErrorsEncountered := false
-			containers, _ := selectContainers(spec.Containers, o.ContainerSelector)
+			containers, _ := selectContainersV1(spec.Containers, o.ContainerSelector)
 			if len(containers) == 0 {
 				fmt.Fprintf(o.ErrOut, "warning: %s does not have any containers matching %q\n", name, o.ContainerSelector)
 				return nil
@@ -377,7 +378,7 @@ func (o *EnvOptions) RunEnv() error {
 							continue
 						}
 
-						value, err := envresolve.GetEnvVarRefValue(o.KubeClient, o.Namespace, store, env.ValueFrom, info.Object, c)
+						value, err := envresolve.GetEnvVarRefValue(o.KClientSet, o.Namespace, store, env.ValueFrom, info.Object, c)
 						// Print the resolved value
 						if err == nil {
 							fmt.Fprintf(o.Out, "%s=%s\n", env.Name, value)
@@ -408,10 +409,10 @@ func (o *EnvOptions) RunEnv() error {
 				return errors.New("failed to retrieve valueFrom references")
 			}
 			return nil
-		}))
+		})
 		if !ok {
 			// This is a fallback function for objects that don't have pod spec.
-			ok, err = updateObjectEnvironment(info.Object, func(vars *[]kapi.EnvVar) error {
+			ok, err = updateObjectEnvironment(info.Object, func(vars *[]corev1.EnvVar) error {
 				if vars == nil {
 					return fmt.Errorf("no environment variables provided")
 				}
@@ -499,40 +500,21 @@ updates:
 }
 
 // UpdateObjectEnvironment update the environment variables in object specification.
-func updateObjectEnvironment(obj runtime.Object, fn func(*[]kapi.EnvVar) error) (bool, error) {
+func updateObjectEnvironment(obj runtime.Object, fn func(*[]corev1.EnvVar) error) (bool, error) {
 	switch t := obj.(type) {
 	case *buildv1.BuildConfig:
 		if t.Spec.Strategy.CustomStrategy != nil {
-			return true, convertInternalEnvVarToExternal(fn)(&t.Spec.Strategy.CustomStrategy.Env)
+			return true, fn(&t.Spec.Strategy.CustomStrategy.Env)
 		}
 		if t.Spec.Strategy.SourceStrategy != nil {
-			return true, convertInternalEnvVarToExternal(fn)(&t.Spec.Strategy.SourceStrategy.Env)
+			return true, fn(&t.Spec.Strategy.SourceStrategy.Env)
 		}
 		if t.Spec.Strategy.DockerStrategy != nil {
-			return true, convertInternalEnvVarToExternal(fn)(&t.Spec.Strategy.DockerStrategy.Env)
+			return true, fn(&t.Spec.Strategy.DockerStrategy.Env)
 		}
 		if t.Spec.Strategy.JenkinsPipelineStrategy != nil {
-			return true, convertInternalEnvVarToExternal(fn)(&t.Spec.Strategy.JenkinsPipelineStrategy.Env)
+			return true, fn(&t.Spec.Strategy.JenkinsPipelineStrategy.Env)
 		}
 	}
 	return false, fmt.Errorf("object does not contain any environment variables %T", obj)
 }
-
-// TODO: this needs to die when switching to external versions
-func convertInternalEnvVarToExternal(inFn func(*[]kapi.EnvVar) error) func(*[]corev1.EnvVar) error {
-	return func(specToMutate *[]corev1.EnvVar) error {
-		externalEnvVar := &[]kapi.EnvVar{}
-		if err := legacyscheme.Scheme.Convert(specToMutate, externalEnvVar, nil); err != nil {
-			return err
-		}
-		if err := inFn(externalEnvVar); err != nil {
-			return err
-		}
-		internalEnvVar := &[]corev1.EnvVar{}
-		if err := legacyscheme.Scheme.Convert(externalEnvVar, internalEnvVar, nil); err != nil {
-			return err
-		}
-		*specToMutate = *internalEnvVar
-		return nil
-	}
-}

pkg/oc/cli/set/helper.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
@@ -26,6 +27,20 @@ func selectContainers(containers []kapi.Container, spec string) ([]*kapi.Contain
 	return out, skipped
 }
 
+// TODO(juanvallejo): remove internal helper once all callers are switched to externals
+func selectContainersV1(containers []corev1.Container, spec string) ([]*corev1.Container, []*corev1.Container) {
+	out := []*corev1.Container{}
+	skipped := []*corev1.Container{}
+	for i, c := range containers {
+		if selectString(c.Name, spec) {
+			out = append(out, &containers[i])
+		} else {
+			skipped = append(skipped, &containers[i])
+		}
+	}
+	return out, skipped
+}
+
 // selectString returns true if the provided string matches spec, where spec is a string with
 // a non-greedy '*' wildcard operator.
 // TODO: turn into a regex and handle greedy matches and backtracking.
@@ -63,8 +78,8 @@ func selectString(s, spec string) bool {
 	return match
 }
 
-func updateEnv(existing []kapi.EnvVar, env []kapi.EnvVar, remove []string) []kapi.EnvVar {
-	out := []kapi.EnvVar{}
+func updateEnv(existing []corev1.EnvVar, env []corev1.EnvVar, remove []string) []corev1.EnvVar {
+	out := []corev1.EnvVar{}
 	covered := sets.NewString(remove...)
 	for _, e := range existing {
 		if covered.Has(e.Name) {
@@ -88,13 +103,13 @@ func updateEnv(existing []kapi.EnvVar, env []kapi.EnvVar, remove []string) []kap
 	return out
 }
 
-func findEnv(env []kapi.EnvVar, name string) (kapi.EnvVar, bool) {
+func findEnv(env []corev1.EnvVar, name string) (corev1.EnvVar, bool) {
 	for _, e := range env {
 		if e.Name == name {
 			return e, true
 		}
 	}
-	return kapi.EnvVar{}, false
+	return corev1.EnvVar{}, false
 }
 
 // Patch represents the result of a mutation to an object.