Upgrade OpenShift and its dependencies.

OpenShift version 1.4.0-alpha.0

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

@@ -1,143 +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_PodSecurityPolicyReview,
-		DeepCopy_api_PodSecurityPolicyReviewSpec,
-		DeepCopy_api_PodSecurityPolicyReviewStatus,
-		DeepCopy_api_PodSecurityPolicySelfSubjectReview,
-		DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec,
-		DeepCopy_api_PodSecurityPolicySubjectReview,
-		DeepCopy_api_PodSecurityPolicySubjectReviewSpec,
-		DeepCopy_api_PodSecurityPolicySubjectReviewStatus,
-		DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus,
-	); err != nil {
-		// if one of the deep copy functions is malformed, detect it immediately.
-		panic(err)
-	}
-}
-
-func DeepCopy_api_PodSecurityPolicyReview(in PodSecurityPolicyReview, out *PodSecurityPolicyReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicyReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicyReviewStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicyReviewSpec(in PodSecurityPolicyReviewSpec, out *PodSecurityPolicyReviewSpec, c *conversion.Cloner) error {
-	if err := api.DeepCopy_api_PodSpec(in.PodSpec, &out.PodSpec, c); err != nil {
-		return err
-	}
-	if in.ServiceAccountNames != nil {
-		in, out := in.ServiceAccountNames, &out.ServiceAccountNames
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.ServiceAccountNames = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicyReviewStatus(in PodSecurityPolicyReviewStatus, out *PodSecurityPolicyReviewStatus, c *conversion.Cloner) error {
-	if in.AllowedServiceAccounts != nil {
-		in, out := in.AllowedServiceAccounts, &out.AllowedServiceAccounts
-		*out = make([]ServiceAccountPodSecurityPolicyReviewStatus, len(in))
-		for i := range in {
-			if err := DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.AllowedServiceAccounts = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicySelfSubjectReview(in PodSecurityPolicySelfSubjectReview, out *PodSecurityPolicySelfSubjectReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec(in PodSecurityPolicySelfSubjectReviewSpec, out *PodSecurityPolicySelfSubjectReviewSpec, c *conversion.Cloner) error {
-	if err := api.DeepCopy_api_PodSpec(in.PodSpec, &out.PodSpec, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicySubjectReview(in PodSecurityPolicySubjectReview, out *PodSecurityPolicySubjectReview, c *conversion.Cloner) error {
-	if err := unversioned.DeepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicySubjectReviewSpec(in.Spec, &out.Spec, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(in.Status, &out.Status, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicySubjectReviewSpec(in PodSecurityPolicySubjectReviewSpec, out *PodSecurityPolicySubjectReviewSpec, c *conversion.Cloner) error {
-	if err := api.DeepCopy_api_PodSpec(in.PodSpec, &out.PodSpec, c); err != nil {
-		return err
-	}
-	out.User = in.User
-	if in.Groups != nil {
-		in, out := in.Groups, &out.Groups
-		*out = make([]string, len(in))
-		copy(*out, in)
-	} else {
-		out.Groups = nil
-	}
-	return nil
-}
-
-func DeepCopy_api_PodSecurityPolicySubjectReviewStatus(in PodSecurityPolicySubjectReviewStatus, out *PodSecurityPolicySubjectReviewStatus, c *conversion.Cloner) error {
-	if in.AllowedBy != nil {
-		in, out := in.AllowedBy, &out.AllowedBy
-		*out = new(api.ObjectReference)
-		if err := api.DeepCopy_api_ObjectReference(*in, *out, c); err != nil {
-			return err
-		}
-	} else {
-		out.AllowedBy = nil
-	}
-	out.Reason = in.Reason
-	if err := api.DeepCopy_api_PodSpec(in.PodSpec, &out.PodSpec, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus(in ServiceAccountPodSecurityPolicyReviewStatus, out *ServiceAccountPodSecurityPolicyReviewStatus, c *conversion.Cloner) error {
-	if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(in.PodSecurityPolicySubjectReviewStatus, &out.PodSecurityPolicySubjectReviewStatus, c); err != nil {
-		return err
-	}
-	out.Name = in.Name
-	return nil
-}

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

@@ -7,6 +7,9 @@ import (
 
 const GroupName = ""
 
+// TODO no one likes the name security because it so broad as to be meaningless.
+// const FutureGroupName = "security.openshift.io"
+
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 
@@ -20,18 +23,19 @@ 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,
 		&PodSecurityPolicySubjectReview{},
 		&PodSecurityPolicySelfSubjectReview{},
 		&PodSecurityPolicyReview{},
 	)
+	return nil
 }
 
 func (obj *PodSecurityPolicySubjectReview) GetObjectKind() unversioned.ObjectKind {

vendor/github.com/openshift/origin/pkg/security/api/types.go

@@ -7,7 +7,7 @@ import (
 
 // +genclient=true
 
-// PodSecurityPolicySubjectReview checks whether a particular user/SA tuple can create the PodSpec.
+// PodSecurityPolicySubjectReview checks whether a particular user/SA tuple can create the PodTemplateSpec.
 type PodSecurityPolicySubjectReview struct {
 	unversioned.TypeMeta
 
@@ -20,13 +20,13 @@ type PodSecurityPolicySubjectReview struct {
 
 // PodSecurityPolicySubjectReviewSpec defines specification for PodSecurityPolicySubjectReview
 type PodSecurityPolicySubjectReviewSpec struct {
-	// PodSpec is the PodSpec to check. If PodSpec.ServiceAccountName is empty it will not be defaulted.
+	// Template is the PodTemplateSpec to check. If PodTemplateSpec.Spec.ServiceAccountName is empty it will not be defaulted.
 	// If its non-empty, it will be checked.
-	PodSpec kapi.PodSpec
+	Template kapi.PodTemplateSpec
 
 	// User is the user you're testing for.
 	// If you specify "User" but not "Group", then is it interpreted as "What if User were not a member of any groups.
-	// If User and Groups are empty, then the check is performed using *only* the ServiceAccountName in the PodSpec.
+	// If User and Groups are empty, then the check is performed using *only* the ServiceAccountName in the PodTemplateSpec.
 	User string
 
 	// Groups is the groups you're testing for.
@@ -35,7 +35,7 @@ type PodSecurityPolicySubjectReviewSpec struct {
 
 // PodSecurityPolicySubjectReviewStatus contains information/status for PodSecurityPolicySubjectReview.
 type PodSecurityPolicySubjectReviewStatus struct {
-	// AllowedBy is a reference to the rule that allows the PodSpec.
+	// AllowedBy is a reference to the rule that allows the PodTemplateSpec.
 	// A rule can be a SecurityContextConstraint or a PodSecurityPolicy
 	// A `nil`, indicates that it was denied.
 	AllowedBy *kapi.ObjectReference
@@ -45,11 +45,11 @@ type PodSecurityPolicySubjectReviewStatus struct {
 	// is no information available.
 	Reason string
 
-	// PodSpec is the PodSpec after the defaulting is applied.
-	PodSpec kapi.PodSpec
+	// Template is the PodTemplateSpec after the defaulting is applied.
+	Template kapi.PodTemplateSpec
 }
 
-// PodSecurityPolicySelfSubjectReview checks whether this user/SA tuple can create the PodSpec.
+// PodSecurityPolicySelfSubjectReview checks whether this user/SA tuple can create the PodTemplateSpec.
 type PodSecurityPolicySelfSubjectReview struct {
 	unversioned.TypeMeta
 
@@ -62,11 +62,11 @@ type PodSecurityPolicySelfSubjectReview struct {
 
 // PodSecurityPolicySelfSubjectReviewSpec contains specification for PodSecurityPolicySelfSubjectReview.
 type PodSecurityPolicySelfSubjectReviewSpec struct {
-	// PodSpec is the PodSpec to check.
-	PodSpec kapi.PodSpec
+	// Template is the PodTemplateSpec to check.
+	Template kapi.PodTemplateSpec
 }
 
-// PodSecurityPolicyReview checks which service accounts (not users, since that would be cluster-wide) can create the `PodSpec` in question.
+// PodSecurityPolicyReview checks which service accounts (not users, since that would be cluster-wide) can create the `PodTemplateSpec` in question.
 type PodSecurityPolicyReview struct {
 	unversioned.TypeMeta
 
@@ -79,22 +79,22 @@ type PodSecurityPolicyReview struct {
 
 // PodSecurityPolicyReviewSpec defines specification for PodSecurityPolicyReview
 type PodSecurityPolicyReviewSpec struct {
-	// PodSpec is the PodSpec to check. The PodSpec.ServiceAccountName field is used
-	// if ServiceAccountNames is empty, unless the PodSpec.ServiceAccountName is empty,
+	// Template is the PodTemplateSpec to check. The PodTemplateSpec.Spec.ServiceAccountName field is used
+	// if ServiceAccountNames is empty, unless the PodTemplateSpec.Spec.ServiceAccountName is empty,
 	// in which case "default" is used.
-	// If ServiceAccountNames is specified, PodSpec.ServiceAccountName is ignored.
-	PodSpec kapi.PodSpec
+	// If ServiceAccountNames is specified, PodTemplateSpec.Spec.ServiceAccountName is ignored.
+	Template kapi.PodTemplateSpec
 
 	// ServiceAccountNames is an optional set of ServiceAccounts to run the check with.
-	// If ServiceAccountNames is empty, the PodSpec ServiceAccountName is used,
+	// If ServiceAccountNames is empty, the PodTemplateSpec.Spec.ServiceAccountName is used,
 	// unless it's empty, in which case "default" is used instead.
-	// If ServiceAccountNames is specified, PodSpec ServiceAccountName is ignored.
+	// If ServiceAccountNames is specified, PodTemplateSpec.Spec.ServiceAccountName is ignored.
 	ServiceAccountNames []string // TODO: find a way to express 'all service accounts'
 }
 
 // PodSecurityPolicyReviewStatus represents the status of PodSecurityPolicyReview.
 type PodSecurityPolicyReviewStatus struct {
-	// AllowedServiceAccounts returns the list of service accounts in *this* namespace that have the power to create the PodSpec.
+	// AllowedServiceAccounts returns the list of service accounts in *this* namespace that have the power to create the PodTemplateSpec.
 	AllowedServiceAccounts []ServiceAccountPodSecurityPolicyReviewStatus
 }
 

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

@@ -0,0 +1,175 @@
+// +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_PodSecurityPolicyReview, InType: reflect.TypeOf(&PodSecurityPolicyReview{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicyReviewSpec, InType: reflect.TypeOf(&PodSecurityPolicyReviewSpec{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicyReviewStatus, InType: reflect.TypeOf(&PodSecurityPolicyReviewStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicySelfSubjectReview, InType: reflect.TypeOf(&PodSecurityPolicySelfSubjectReview{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec, InType: reflect.TypeOf(&PodSecurityPolicySelfSubjectReviewSpec{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicySubjectReview, InType: reflect.TypeOf(&PodSecurityPolicySubjectReview{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicySubjectReviewSpec, InType: reflect.TypeOf(&PodSecurityPolicySubjectReviewSpec{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityPolicySubjectReviewStatus, InType: reflect.TypeOf(&PodSecurityPolicySubjectReviewStatus{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus, InType: reflect.TypeOf(&ServiceAccountPodSecurityPolicyReviewStatus{})},
+	)
+}
+
+func DeepCopy_api_PodSecurityPolicyReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicyReview)
+		out := out.(*PodSecurityPolicyReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_api_PodSecurityPolicyReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_api_PodSecurityPolicyReviewStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicyReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicyReviewSpec)
+		out := out.(*PodSecurityPolicyReviewSpec)
+		if err := pkg_api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		if in.ServiceAccountNames != nil {
+			in, out := &in.ServiceAccountNames, &out.ServiceAccountNames
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.ServiceAccountNames = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicyReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicyReviewStatus)
+		out := out.(*PodSecurityPolicyReviewStatus)
+		if in.AllowedServiceAccounts != nil {
+			in, out := &in.AllowedServiceAccounts, &out.AllowedServiceAccounts
+			*out = make([]ServiceAccountPodSecurityPolicyReviewStatus, len(*in))
+			for i := range *in {
+				if err := DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus(&(*in)[i], &(*out)[i], c); err != nil {
+					return err
+				}
+			}
+		} else {
+			out.AllowedServiceAccounts = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicySelfSubjectReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicySelfSubjectReview)
+		out := out.(*PodSecurityPolicySelfSubjectReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicySelfSubjectReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicySelfSubjectReviewSpec)
+		out := out.(*PodSecurityPolicySelfSubjectReviewSpec)
+		if err := pkg_api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicySubjectReview(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicySubjectReview)
+		out := out.(*PodSecurityPolicySubjectReview)
+		out.TypeMeta = in.TypeMeta
+		if err := DeepCopy_api_PodSecurityPolicySubjectReviewSpec(&in.Spec, &out.Spec, c); err != nil {
+			return err
+		}
+		if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(&in.Status, &out.Status, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicySubjectReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicySubjectReviewSpec)
+		out := out.(*PodSecurityPolicySubjectReviewSpec)
+		if err := pkg_api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		out.User = in.User
+		if in.Groups != nil {
+			in, out := &in.Groups, &out.Groups
+			*out = make([]string, len(*in))
+			copy(*out, *in)
+		} else {
+			out.Groups = nil
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_PodSecurityPolicySubjectReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*PodSecurityPolicySubjectReviewStatus)
+		out := out.(*PodSecurityPolicySubjectReviewStatus)
+		if in.AllowedBy != nil {
+			in, out := &in.AllowedBy, &out.AllowedBy
+			*out = new(pkg_api.ObjectReference)
+			**out = **in
+		} else {
+			out.AllowedBy = nil
+		}
+		out.Reason = in.Reason
+		if err := pkg_api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func DeepCopy_api_ServiceAccountPodSecurityPolicyReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ServiceAccountPodSecurityPolicyReviewStatus)
+		out := out.(*ServiceAccountPodSecurityPolicyReviewStatus)
+		if err := DeepCopy_api_PodSecurityPolicySubjectReviewStatus(&in.PodSecurityPolicySubjectReviewStatus, &out.PodSecurityPolicySubjectReviewStatus, c); err != nil {
+			return err
+		}
+		out.Name = in.Name
+		return nil
+	}
+}