Upgrade OpenShift and its dependencies.

OpenShift version 1.4.0-alpha.0

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

@@ -1,257 +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"
-)
-
-func init() {
-	if err := api.Scheme.AddGeneratedDeepCopyFuncs(
-		DeepCopy_api_ClusterRoleScopeRestriction,
-		DeepCopy_api_OAuthAccessToken,
-		DeepCopy_api_OAuthAccessTokenList,
-		DeepCopy_api_OAuthAuthorizeToken,
-		DeepCopy_api_OAuthAuthorizeTokenList,
-		DeepCopy_api_OAuthClient,
-		DeepCopy_api_OAuthClientAuthorization,
-		DeepCopy_api_OAuthClientAuthorizationList,
-		DeepCopy_api_OAuthClientList,
-		DeepCopy_api_ScopeRestriction,
-	); err != nil {
-		// if one of the deep copy functions is malformed, detect it immediately.
-		panic(err)
-	}
-}
-
-func DeepCopy_api_ClusterRoleScopeRestriction(in ClusterRoleScopeRestriction, out *ClusterRoleScopeRestriction, c *conversion.Cloner) error {
-	if in.RoleNames != nil {
-		in, out := in.RoleNames, &out.RoleNames
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.RoleNames = nil
-	}
-	if in.Namespaces != nil {
-		in, out := in.Namespaces, &out.Namespaces
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Namespaces = nil
-	}
-	out.AllowEscalation = in.AllowEscalation
-	return nil
-}
-
-func DeepCopy_api_OAuthAccessToken(in OAuthAccessToken, out *OAuthAccessToken, 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
-	}
-	out.ClientName = in.ClientName
-	out.ExpiresIn = in.ExpiresIn
-	if in.Scopes != nil {
-		in, out := in.Scopes, &out.Scopes
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Scopes = nil
-	}
-	out.RedirectURI = in.RedirectURI
-	out.UserName = in.UserName
-	out.UserUID = in.UserUID
-	out.AuthorizeToken = in.AuthorizeToken
-	out.RefreshToken = in.RefreshToken
-	return nil
-}
-
-func DeepCopy_api_OAuthAccessTokenList(in OAuthAccessTokenList, out *OAuthAccessTokenList, 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([]OAuthAccessToken, len(in))
-		for i := range in {
-			if err := DeepCopy_api_OAuthAccessToken(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_OAuthAuthorizeToken(in OAuthAuthorizeToken, out *OAuthAuthorizeToken, 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
-	}
-	out.ClientName = in.ClientName
-	out.ExpiresIn = in.ExpiresIn
-	if in.Scopes != nil {
-		in, out := in.Scopes, &out.Scopes
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Scopes = nil
-	}
-	out.RedirectURI = in.RedirectURI
-	out.State = in.State
-	out.UserName = in.UserName
-	out.UserUID = in.UserUID
-	return nil
-}
-
-func DeepCopy_api_OAuthAuthorizeTokenList(in OAuthAuthorizeTokenList, out *OAuthAuthorizeTokenList, 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([]OAuthAuthorizeToken, len(in))
-		for i := range in {
-			if err := DeepCopy_api_OAuthAuthorizeToken(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_OAuthClient(in OAuthClient, out *OAuthClient, 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
-	}
-	out.Secret = in.Secret
-	if in.AdditionalSecrets != nil {
-		in, out := in.AdditionalSecrets, &out.AdditionalSecrets
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.AdditionalSecrets = nil
-	}
-	out.RespondWithChallenges = in.RespondWithChallenges
-	if in.RedirectURIs != nil {
-		in, out := in.RedirectURIs, &out.RedirectURIs
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.RedirectURIs = nil
-	}
-	out.GrantMethod = in.GrantMethod
-	if in.ScopeRestrictions != nil {
-		in, out := in.ScopeRestrictions, &out.ScopeRestrictions
-		*out = make([]ScopeRestriction, len(in))
-		for i := range in {
-			if err := DeepCopy_api_ScopeRestriction(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.ScopeRestrictions = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_OAuthClientAuthorization(in OAuthClientAuthorization, out *OAuthClientAuthorization, 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
-	}
-	out.ClientName = in.ClientName
-	out.UserName = in.UserName
-	out.UserUID = in.UserUID
-	if in.Scopes != nil {
-		in, out := in.Scopes, &out.Scopes
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Scopes = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_OAuthClientAuthorizationList(in OAuthClientAuthorizationList, out *OAuthClientAuthorizationList, 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([]OAuthClientAuthorization, len(in))
-		for i := range in {
-			if err := DeepCopy_api_OAuthClientAuthorization(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_OAuthClientList(in OAuthClientList, out *OAuthClientList, 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([]OAuthClient, len(in))
-		for i := range in {
-			if err := DeepCopy_api_OAuthClient(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Items = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_ScopeRestriction(in ScopeRestriction, out *ScopeRestriction, c *conversion.Cloner) error {
-	if in.ExactValues != nil {
-		in, out := in.ExactValues, &out.ExactValues
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.ExactValues = nil
-	}
-	if in.ClusterRole != nil {
-		in, out := in.ClusterRole, &out.ClusterRole
-		*out = new(ClusterRoleScopeRestriction)
-		if err := DeepCopy_api_ClusterRoleScopeRestriction(*in, *out, c); err != nil {
-			return err
-		}
-	} else {
-		out.ClusterRole = nil
-	}
-	return nil
-}

vendor/github.com/openshift/origin/pkg/oauth/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/oauth/api/register.go

@@ -6,6 +6,7 @@ import (
 )
 
 const GroupName = ""
+const FutureGroupName = "oauth.openshift.io"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
@@ -20,13 +21,13 @@ 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,
 		&OAuthAccessToken{},
 		&OAuthAccessTokenList{},
@@ -37,6 +38,7 @@ func addKnownTypes(scheme *runtime.Scheme) {
 		&OAuthClientAuthorization{},
 		&OAuthClientAuthorizationList{},
 	)
+	return nil
 }
 
 func (obj *OAuthClientAuthorizationList) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }

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

@@ -0,0 +1,277 @@
+// +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"
+	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_ClusterRoleScopeRestriction, InType: reflect.TypeOf(&ClusterRoleScopeRestriction{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthAccessToken, InType: reflect.TypeOf(&OAuthAccessToken{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthAccessTokenList, InType: reflect.TypeOf(&OAuthAccessTokenList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthAuthorizeToken, InType: reflect.TypeOf(&OAuthAuthorizeToken{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthAuthorizeTokenList, InType: reflect.TypeOf(&OAuthAuthorizeTokenList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthClient, InType: reflect.TypeOf(&OAuthClient{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthClientAuthorization, InType: reflect.TypeOf(&OAuthClientAuthorization{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthClientAuthorizationList, InType: reflect.TypeOf(&OAuthClientAuthorizationList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OAuthClientList, InType: reflect.TypeOf(&OAuthClientList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ScopeRestriction, InType: reflect.TypeOf(&ScopeRestriction{})},
+	)
+}
+
+func DeepCopy_api_ClusterRoleScopeRestriction(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ClusterRoleScopeRestriction)
+		out := out.(*ClusterRoleScopeRestriction)
+		if in.RoleNames != nil {
+			in, out := &in.RoleNames, &out.RoleNames
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.RoleNames = nil
+		}
+		if in.Namespaces != nil {
+			in, out := &in.Namespaces, &out.Namespaces
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Namespaces = nil
+		}
+		out.AllowEscalation = in.AllowEscalation
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthAccessToken(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthAccessToken)
+		out := out.(*OAuthAccessToken)
+		out.TypeMeta = in.TypeMeta
+		if err := pkg_api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.ClientName = in.ClientName
+		out.ExpiresIn = in.ExpiresIn
+		if in.Scopes != nil {
+			in, out := &in.Scopes, &out.Scopes
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Scopes = nil
+		}
+		out.RedirectURI = in.RedirectURI
+		out.UserName = in.UserName
+		out.UserUID = in.UserUID
+		out.AuthorizeToken = in.AuthorizeToken
+		out.RefreshToken = in.RefreshToken
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthAccessTokenList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthAccessTokenList)
+		out := out.(*OAuthAccessTokenList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]OAuthAccessToken, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_OAuthAccessToken(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthAuthorizeToken(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthAuthorizeToken)
+		out := out.(*OAuthAuthorizeToken)
+		out.TypeMeta = in.TypeMeta
+		if err := pkg_api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.ClientName = in.ClientName
+		out.ExpiresIn = in.ExpiresIn
+		if in.Scopes != nil {
+			in, out := &in.Scopes, &out.Scopes
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Scopes = nil
+		}
+		out.RedirectURI = in.RedirectURI
+		out.State = in.State
+		out.UserName = in.UserName
+		out.UserUID = in.UserUID
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthAuthorizeTokenList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthAuthorizeTokenList)
+		out := out.(*OAuthAuthorizeTokenList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]OAuthAuthorizeToken, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_OAuthAuthorizeToken(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthClient(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthClient)
+		out := out.(*OAuthClient)
+		out.TypeMeta = in.TypeMeta
+		if err := pkg_api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.Secret = in.Secret
+		if in.AdditionalSecrets != nil {
+			in, out := &in.AdditionalSecrets, &out.AdditionalSecrets
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.AdditionalSecrets = nil
+		}
+		out.RespondWithChallenges = in.RespondWithChallenges
+		if in.RedirectURIs != nil {
+			in, out := &in.RedirectURIs, &out.RedirectURIs
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.RedirectURIs = nil
+		}
+		out.GrantMethod = in.GrantMethod
+		if in.ScopeRestrictions != nil {
+			in, out := &in.ScopeRestrictions, &out.ScopeRestrictions
+			*out = make([]ScopeRestriction, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_ScopeRestriction(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.ScopeRestrictions = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthClientAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthClientAuthorization)
+		out := out.(*OAuthClientAuthorization)
+		out.TypeMeta = in.TypeMeta
+		if err := pkg_api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
+			return err
+		}
+		out.ClientName = in.ClientName
+		out.UserName = in.UserName
+		out.UserUID = in.UserUID
+		if in.Scopes != nil {
+			in, out := &in.Scopes, &out.Scopes
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Scopes = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthClientAuthorizationList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthClientAuthorizationList)
+		out := out.(*OAuthClientAuthorizationList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]OAuthClientAuthorization, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_OAuthClientAuthorization(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_OAuthClientList(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*OAuthClientList)
+		out := out.(*OAuthClientList)
+		out.TypeMeta = in.TypeMeta
+		out.ListMeta = in.ListMeta
+		if in.Items != nil {
+			in, out := &in.Items, &out.Items
+			*out = make([]OAuthClient, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_OAuthClient(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.Items = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_ScopeRestriction(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ScopeRestriction)
+		out := out.(*ScopeRestriction)
+		if in.ExactValues != nil {
+			in, out := &in.ExactValues, &out.ExactValues
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.ExactValues = nil
+		}
+		if in.ClusterRole != nil {
+			in, out := &in.ClusterRole, &out.ClusterRole
+			*out = new(ClusterRoleScopeRestriction)
+			if err := DeepCopy_api_ClusterRoleScopeRestriction(*in, *out, c); err != nil {
+				return err
+			}
+		} else {
+			out.ClusterRole = nil
+		}
+		return nil
+	}
+}