Upgrade OpenShift and its dependencies.

OpenShift version 1.4.0-alpha.0

vendor/github.com/openshift/origin/pkg/route/api/deep_copy_generated.go

@@ -1,190 +0,0 @@
-// +build !ignore_autogenerated_openshift
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package api
-
-import (
-	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
-	conversion "k8s.io/kubernetes/pkg/conversion"
-	intstr "k8s.io/kubernetes/pkg/util/intstr"
-)
-
-func init() {
-	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_api_Route,
-		DeepCopy_api_RouteIngress,
-		DeepCopy_api_RouteIngressCondition,
-		DeepCopy_api_RouteList,
-		DeepCopy_api_RoutePort,
-		DeepCopy_api_RouteSpec,
-		DeepCopy_api_RouteStatus,
-		DeepCopy_api_RouteTargetReference,
-		DeepCopy_api_RouterShard,
-		DeepCopy_api_TLSConfig,
-	); err != nil {
-		// if one of the deep copy functions is malformed, detect it immediately.
-		panic(err)
-	}
-}
-
-func DeepCopy_api_Route(in Route, out *Route, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
-		return err
-	}
-	if err := api.DeepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_RouteSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_RouteStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteIngress(in RouteIngress, out *RouteIngress, c *conversion.Cloner) error {
-	out.Host = in.Host
-	out.RouterName = in.RouterName
-	if in.Conditions != nil {
-		in, out := in.Conditions, &out.Conditions
-		*out = make([]RouteIngressCondition, len(in))
-		for i := range in {
-			if err := DeepCopy_api_RouteIngressCondition(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Conditions = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteIngressCondition(in RouteIngressCondition, out *RouteIngressCondition, c *conversion.Cloner) error {
-	out.Type = in.Type
-	out.Status = in.Status
-	out.Reason = in.Reason
-	out.Message = in.Message
-	if in.LastTransitionTime != nil {
-		in, out := in.LastTransitionTime, &out.LastTransitionTime
-		*out = new(unversioned.Time)
-		if err := unversioned.DeepCopy_unversioned_Time(*in, *out, c); err != nil {
-			return err
-		}
-	} else {
-		out.LastTransitionTime = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteList(in RouteList, out *RouteList, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
-		return err
-	}
-	if err := unversioned.DeepCopy_unversioned_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil {
-		return err
-	}
-	if in.Items != nil {
-		in, out := in.Items, &out.Items
-		*out = make([]Route, len(in))
-		for i := range in {
-			if err := DeepCopy_api_Route(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RoutePort(in RoutePort, out *RoutePort, c *conversion.Cloner) error {
-	if err := intstr.DeepCopy_intstr_IntOrString(in.TargetPort, &out.TargetPort, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteSpec(in RouteSpec, out *RouteSpec, c *conversion.Cloner) error {
-	out.Host = in.Host
-	out.Path = in.Path
-	if err := DeepCopy_api_RouteTargetReference(in.To, &out.To, c); err != nil {
-		return err
-	}
-	if in.AlternateBackends != nil {
-		in, out := in.AlternateBackends, &out.AlternateBackends
-		*out = make([]RouteTargetReference, len(in))
-		for i := range in {
-			if err := DeepCopy_api_RouteTargetReference(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.AlternateBackends = nil
-	}
-	if in.Port != nil {
-		in, out := in.Port, &out.Port
-		*out = new(RoutePort)
-		if err := DeepCopy_api_RoutePort(*in, *out, c); err != nil {
-			return err
-		}
-	} else {
-		out.Port = nil
-	}
-	if in.TLS != nil {
-		in, out := in.TLS, &out.TLS
-		*out = new(TLSConfig)
-		if err := DeepCopy_api_TLSConfig(*in, *out, c); err != nil {
-			return err
-		}
-	} else {
-		out.TLS = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteStatus(in RouteStatus, out *RouteStatus, c *conversion.Cloner) error {
-	if in.Ingress != nil {
-		in, out := in.Ingress, &out.Ingress
-		*out = make([]RouteIngress, len(in))
-		for i := range in {
-			if err := DeepCopy_api_RouteIngress(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Ingress = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RouteTargetReference(in RouteTargetReference, out *RouteTargetReference, c *conversion.Cloner) error {
-	out.Kind = in.Kind
-	out.Name = in.Name
-	if in.Weight != nil {
-		in, out := in.Weight, &out.Weight
-		*out = new(int32)
-		**out = *in
-	} else {
-		out.Weight = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_RouterShard(in RouterShard, out *RouterShard, c *conversion.Cloner) error {
-	out.ShardName = in.ShardName
-	out.DNSSuffix = in.DNSSuffix
-	return nil
-}
-
-func DeepCopy_api_TLSConfig(in TLSConfig, out *TLSConfig, c *conversion.Cloner) error {
-	out.Termination = in.Termination
-	out.Certificate = in.Certificate
-	out.Key = in.Key
-	out.CACertificate = in.CACertificate
-	out.DestinationCACertificate = in.DestinationCACertificate
-	out.InsecureEdgeTerminationPolicy = in.InsecureEdgeTerminationPolicy
-	return nil
-}

vendor/github.com/openshift/origin/pkg/route/api/doc.go

@@ -0,0 +1,4 @@
+// +k8s:deepcopy-gen=package,register
+
+// Package api is the internal version of the API.
+package api

vendor/github.com/openshift/origin/pkg/route/api/register.go

@@ -6,6 +6,7 @@ import (
 )
 
 const GroupName = ""
+const FutureGroupName = "route.openshift.io"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
@@ -20,17 +21,18 @@ func Resource(resource string) unversioned.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-func AddToScheme(scheme *runtime.Scheme) {
-	// Add the API to Scheme.
-	addKnownTypes(scheme)
-}
+var (
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
 
 // Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) {
+func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Route{},
 		&RouteList{},
 	)
+	return nil
 }
 
 func (obj *Route) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }

vendor/github.com/openshift/origin/pkg/route/api/zz_generated.deepcopy.go

@@ -0,0 +1,220 @@
+// +build !ignore_autogenerated_openshift
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package api
+
+import (
+	pkg_api "k8s.io/kubernetes/pkg/api"
+	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+	runtime "k8s.io/kubernetes/pkg/runtime"
+	reflect "reflect"
+)
+
+func init() {
+	SchemeBuilder.Register(RegisterDeepCopies)
+}
+
+// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
+// to allow building arbitrary schemes.
+func RegisterDeepCopies(scheme *runtime.Scheme) error {
+	return scheme.AddGeneratedDeepCopyFuncs(
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Route, InType: reflect.TypeOf(&Route{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteIngress, InType: reflect.TypeOf(&RouteIngress{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteIngressCondition, InType: reflect.TypeOf(&RouteIngressCondition{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteList, InType: reflect.TypeOf(&RouteList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RoutePort, InType: reflect.TypeOf(&RoutePort{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteSpec, InType: reflect.TypeOf(&RouteSpec{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteStatus, InType: reflect.TypeOf(&RouteStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouteTargetReference, InType: reflect.TypeOf(&RouteTargetReference{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RouterShard, InType: reflect.TypeOf(&RouterShard{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_TLSConfig, InType: reflect.TypeOf(&TLSConfig{})},
+	)
+}
+
+func DeepCopy_api_Route(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*Route)
+		out := out.(*Route)
+		out.TypeMeta = in.TypeMeta
+		if err := pkg_api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_api_RouteSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_api_RouteStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteIngress(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteIngress)
+		out := out.(*RouteIngress)
+		out.Host = in.Host
+		out.RouterName = in.RouterName
+		if in.Conditions != nil {
+			in, out := &in.Conditions, &out.Conditions
+			*out = make([]RouteIngressCondition, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_RouteIngressCondition(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Conditions = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteIngressCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteIngressCondition)
+		out := out.(*RouteIngressCondition)
+		out.Type = in.Type
+		out.Status = in.Status
+		out.Reason = in.Reason
+		out.Message = in.Message
+		if in.LastTransitionTime != nil {
+			in, out := &in.LastTransitionTime, &out.LastTransitionTime
+			*out = new(unversioned.Time)
+			**out = (*in).DeepCopy()
+		} else {
+			out.LastTransitionTime = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteList)
+		out := out.(*RouteList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]Route, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_Route(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RoutePort(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RoutePort)
+		out := out.(*RoutePort)
+		out.TargetPort = in.TargetPort
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteSpec)
+		out := out.(*RouteSpec)
+		out.Host = in.Host
+		out.Path = in.Path
+		if err := DeepCopy_api_RouteTargetReference(&in.To, &out.To, c); err != nil {
+			return err
+		}
+		if in.AlternateBackends != nil {
+			in, out := &in.AlternateBackends, &out.AlternateBackends
+			*out = make([]RouteTargetReference, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_RouteTargetReference(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.AlternateBackends = nil
+		}
+		if in.Port != nil {
+			in, out := &in.Port, &out.Port
+			*out = new(RoutePort)
+			**out = **in
+		} else {
+			out.Port = nil
+		}
+		if in.TLS != nil {
+			in, out := &in.TLS, &out.TLS
+			*out = new(TLSConfig)
+			**out = **in
+		} else {
+			out.TLS = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteStatus)
+		out := out.(*RouteStatus)
+		if in.Ingress != nil {
+			in, out := &in.Ingress, &out.Ingress
+			*out = make([]RouteIngress, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_RouteIngress(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Ingress = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouteTargetReference(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouteTargetReference)
+		out := out.(*RouteTargetReference)
+		out.Kind = in.Kind
+		out.Name = in.Name
+		if in.Weight != nil {
+			in, out := &in.Weight, &out.Weight
+			*out = new(int32)
+			**out = **in
+		} else {
+			out.Weight = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_RouterShard(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*RouterShard)
+		out := out.(*RouterShard)
+		out.ShardName = in.ShardName
+		out.DNSSuffix = in.DNSSuffix
+		return nil
+	}
+}
+
+func DeepCopy_api_TLSConfig(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*TLSConfig)
+		out := out.(*TLSConfig)
+		out.Termination = in.Termination
+		out.Certificate = in.Certificate
+		out.Key = in.Key
+		out.CACertificate = in.CACertificate
+		out.DestinationCACertificate = in.DestinationCACertificate
+		out.InsecureEdgeTerminationPolicy = in.InsecureEdgeTerminationPolicy
+		return nil
+	}
+}