@@ -175,10 +175,10 @@ type ResourceAccessReviewResponse struct {

 	// Namespace is the namespace used for the access review

 	Namespace string

 	// Users is the list of users who can perform the action

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Users sets.String

 	// Groups is the list of groups who can perform the action

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Groups sets.String

 	// EvaluationError is an indication that some error occurred during resolution, but partial results can still be returned.

@@ -221,7 +221,7 @@ type SubjectAccessReview struct {

 	// User is optional.  If both User and Groups are empty, the current authenticated user is used.

 	User string

 	// Groups is optional.  Groups is the list of groups to which the User belongs.

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Groups sets.String

 	// Scopes to use for the evaluation.  Empty means "use the unscoped (full) permissions of the user/groups".

 	// Nil for a self-SAR, means "use the scopes on this request".

@@ -246,7 +246,7 @@ type LocalSubjectAccessReview struct {

 	// User is optional.  If both User and Groups are empty, the current authenticated user is used.

 	User string

 	// Groups is optional.  Groups is the list of groups to which the User belongs.

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Groups sets.String

 	// Scopes to use for the evaluation.  Empty means "use the unscoped (full) permissions of the user/groups".

 	// Nil for a self-SAR, means "use the scopes on this request".

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/authorization/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -62,10 +62,10 @@ type RoleBinding struct {

 	kapi.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

 	// UserNames holds all the usernames directly bound to the role

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	UserNames OptionalNames `json:"userNames" protobuf:"bytes,2,rep,name=userNames"`

 	// GroupNames holds all the groups directly bound to the role

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	GroupNames OptionalNames `json:"groupNames" protobuf:"bytes,3,rep,name=groupNames"`

 	// Subjects hold object references to authorize with this rule

 	Subjects []kapi.ObjectReference `json:"subjects" protobuf:"bytes,4,rep,name=subjects"`

@@ -162,10 +162,10 @@ type ResourceAccessReviewResponse struct {

 	// Namespace is the namespace used for the access review

 	Namespace string `json:"namespace,omitempty" protobuf:"bytes,1,opt,name=namespace"`

 	// UsersSlice is the list of users who can perform the action

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	UsersSlice []string `json:"users" protobuf:"bytes,2,rep,name=users"`

 	// GroupsSlice is the list of groups who can perform the action

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	GroupsSlice []string `json:"groups" protobuf:"bytes,3,rep,name=groups"`

 	// EvaluationError is an indication that some error occurred during resolution, but partial results can still be returned.

@@ -212,7 +212,7 @@ type SubjectAccessReview struct {

 	// User is optional. If both User and Groups are empty, the current authenticated user is used.

 	User string `json:"user" protobuf:"bytes,2,opt,name=user"`

 	// GroupsSlice is optional. Groups is the list of groups to which the User belongs.

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	GroupsSlice []string `json:"groups" protobuf:"bytes,3,rep,name=groups"`

 	// Scopes to use for the evaluation.  Empty means "use the unscoped (full) permissions of the user/groups".

 	// Nil for a self-SAR, means "use the scopes on this request".

@@ -237,7 +237,7 @@ type LocalSubjectAccessReview struct {

 	// User is optional.  If both User and Groups are empty, the current authenticated user is used.

 	User string `json:"user" protobuf:"bytes,2,opt,name=user"`

 	// Groups is optional.  Groups is the list of groups to which the User belongs.

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	GroupsSlice []string `json:"groups" protobuf:"bytes,3,rep,name=groups"`

 	// Scopes to use for the evaluation.  Empty means "use the unscoped (full) permissions of the user/groups".

 	// Nil for a self-SAR, means "use the scopes on this request".

@@ -324,10 +324,10 @@ type ClusterRoleBinding struct {

 	kapi.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

 	// UserNames holds all the usernames directly bound to the role

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	UserNames OptionalNames `json:"userNames" protobuf:"bytes,2,rep,name=userNames"`

 	// GroupNames holds all the groups directly bound to the role

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	GroupNames OptionalNames `json:"groupNames" protobuf:"bytes,3,rep,name=groupNames"`

 	// Subjects hold object references to authorize with this rule

 	Subjects []kapi.ObjectReference `json:"subjects" protobuf:"bytes,4,rep,name=subjects"`

@@ -806,6 +806,7 @@ type GitInfo struct {

 	// Refs is a list of GitRefs for the provided repo - generally sent

 	// when used from a post-receive hook. This field is optional and is

 	// used when sending multiple refs

+	// +k8s:conversion-gen=false

 	Refs []GitRefInfo

 }

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/build/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -212,7 +212,7 @@ const (

 // BuildSource is the SCM used for the build.

 type BuildSource struct {

 	// type of build input to accept

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Type BuildSourceType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=BuildSourceType"`

 	// binary builds accept a binary as their input. The binary is generally assumed to be a tar,

@@ -314,7 +314,7 @@ type BinaryBuildSource struct {

 // SourceRevision is the revision or commit information from the source for the build

 type SourceRevision struct {

 	// type of the build source, may be one of 'Source', 'Dockerfile', 'Binary', or 'Images'

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Type BuildSourceType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=BuildSourceType"`

 	// Git contains information about git-based build source

@@ -364,7 +364,7 @@ type SourceControlUser struct {

 // BuildStrategy contains the details of how to perform a build.

 type BuildStrategy struct {

 	// type is the kind of build strategy.

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Type BuildStrategyType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=BuildStrategyType"`

 	// dockerStrategy holds the parameters to the Docker build strategy.

@@ -751,7 +751,7 @@ type BuildConfigList struct {

 // GenericWebHookEvent is the payload expected for a generic webhook post

 type GenericWebHookEvent struct {

 	// type is the type of source repository

-	// +genconversion=false

+	// +k8s:conversion-gen=false

 	Type BuildSourceType `json:"type,omitempty" protobuf:"bytes,1,opt,name=type,casttype=BuildSourceType"`

 	// git is the git information if the Type is BuildSourceGit

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/deploy/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -308,6 +308,7 @@ type ImageStreamMapping struct {

 	// The Docker image repository the specified image is located in

 	// DEPRECATED: remove once v1beta1 support is dropped

+	// +k8s:conversion-gen=false

 	DockerImageRepository string

 	// A Docker image.

 	Image Image

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/image/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/oauth/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/project/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/quota/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/route/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/sdn/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/security/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/template/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1

@@ -1,3 +1,5 @@

+// +k8s:deepcopy-gen=package,register

+// +k8s:conversion-gen=github.com/openshift/origin/pkg/user/api

+

 // Package v1 is the v1 version of the API.

-// +genconversion=true

 package v1