Merge pull request #16469 from sttts/sttts-static-deepcopy-prep

Automatic merge from submit-queue

Prepare for static deep-copy in 3.8 rebase

This has no effect yet in 3.7 based master, but will make the 3.8 rebase much easier
with the deepcopy tags in place and test types moved into non-test packages to
be reachable by deepcopy-gen.

Author: openshift-merge-robot

pkg/apps/apis/apps/types.go

@@ -127,6 +127,7 @@ const (
 // +genclient:method=Rollback,verb=create,subresource=rollback,input=DeploymentConfigRollback
 // +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
 // +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // DeploymentConfig represents a configuration for a single deployment (represented as a
 // ReplicationController). It also contains details about changes which resulted in the current
@@ -504,6 +505,8 @@ type DeploymentCondition struct {
 	Message string
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentConfigList is a collection of deployment configs.
 type DeploymentConfigList struct {
 	metav1.TypeMeta
@@ -513,6 +516,8 @@ type DeploymentConfigList struct {
 	Items []DeploymentConfig
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentConfigRollback provides the input to rollback generation.
 type DeploymentConfigRollback struct {
 	metav1.TypeMeta
@@ -540,6 +545,8 @@ type DeploymentConfigRollbackSpec struct {
 	IncludeStrategy bool
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentRequest is a request to a deployment config for a new deployment.
 type DeploymentRequest struct {
 	metav1.TypeMeta
@@ -556,11 +563,15 @@ type DeploymentRequest struct {
 	ExcludeTriggers []DeploymentTriggerType
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentLog represents the logs for a deployment
 type DeploymentLog struct {
 	metav1.TypeMeta
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentLogOptions is the REST options for a deployment log
 type DeploymentLogOptions struct {
 	metav1.TypeMeta

pkg/apps/apis/apps/v1/types.go

@@ -13,6 +13,7 @@ import (
 // +genclient:method=Rollback,verb=create,subresource=rollback,input=DeploymentConfigRollback
 // +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
 // +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale,result=k8s.io/kubernetes/pkg/apis/extensions/v1beta1.Scale
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Deployment Configs define the template for a pod and manages deploying new images or configuration changes.
 // A single deployment configuration is usually analogous to a single micro-service. Can support many different
@@ -379,6 +380,8 @@ type DeploymentCondition struct {
 	Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentConfigList is a collection of deployment configs.
 type DeploymentConfigList struct {
 	metav1.TypeMeta `json:",inline"`
@@ -389,6 +392,8 @@ type DeploymentConfigList struct {
 	Items []DeploymentConfig `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentConfigRollback provides the input to rollback generation.
 type DeploymentConfigRollback struct {
 	metav1.TypeMeta `json:",inline"`
@@ -416,6 +421,8 @@ type DeploymentConfigRollbackSpec struct {
 	IncludeStrategy bool `json:"includeStrategy" protobuf:"varint,6,opt,name=includeStrategy"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentRequest is a request to a deployment config for a new deployment.
 type DeploymentRequest struct {
 	metav1.TypeMeta `json:",inline"`
@@ -432,11 +439,15 @@ type DeploymentRequest struct {
 	ExcludeTriggers []DeploymentTriggerType `json:"excludeTriggers,omitempty" protobuf:"bytes,4,rep,name=excludeTriggers,casttype=DeploymentTriggerType"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentLog represents the logs for a deployment
 type DeploymentLog struct {
 	metav1.TypeMeta `json:",inline"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // DeploymentLogOptions is the REST options for a deployment log
 type DeploymentLogOptions struct {
 	metav1.TypeMeta `json:",inline"`