add iam crd

Signed-off-by: hongming <talonwan@yunify.com>

vendor/github.com/openshift/api/apps/v1/consts.go

@@ -0,0 +1,108 @@
+package v1
+
+const (
+	// DeploymentStatusReasonAnnotation represents the reason for deployment being in a given state
+	// Used for specifying the reason for cancellation or failure of a deployment
+	// This is on replication controller set by deployer controller.
+	DeploymentStatusReasonAnnotation = "openshift.io/deployment.status-reason"
+
+	// DeploymentPodAnnotation is an annotation on a deployment (a ReplicationController). The
+	// annotation value is the name of the deployer Pod which will act upon the ReplicationController
+	// to implement the deployment behavior.
+	// This is set on replication controller by deployer controller.
+	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"
+
+	// DeploymentConfigAnnotation is an annotation name used to correlate a deployment with the
+	// DeploymentConfig on which the deployment is based.
+	// This is set on replication controller pod template by deployer controller.
+	DeploymentConfigAnnotation = "openshift.io/deployment-config.name"
+
+	// DeploymentCancelledAnnotation indicates that the deployment has been cancelled
+	// The annotation value does not matter and its mere presence indicates cancellation.
+	// This is set on replication controller by deployment config controller or oc rollout cancel command.
+	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"
+
+	// DeploymentEncodedConfigAnnotation is an annotation name used to retrieve specific encoded
+	// DeploymentConfig on which a given deployment is based.
+	// This is set on replication controller by deployer controller.
+	DeploymentEncodedConfigAnnotation = "openshift.io/encoded-deployment-config"
+
+	// DeploymentVersionAnnotation is an annotation on a deployment (a ReplicationController). The
+	// annotation value is the LatestVersion value of the DeploymentConfig which was the basis for
+	// the deployment.
+	// This is set on replication controller pod template by deployment config controller.
+	DeploymentVersionAnnotation = "openshift.io/deployment-config.latest-version"
+
+	// DeployerPodForDeploymentLabel is a label which groups pods related to a
+	// deployment. The value is a deployment name. The deployer pod and hook pods
+	// created by the internal strategies will have this label. Custom
+	// strategies can apply this label to any pods they create, enabling
+	// platform-provided cancellation and garbage collection support.
+	// This is set on deployer pod by deployer controller.
+	DeployerPodForDeploymentLabel = "openshift.io/deployer-pod-for.name"
+
+	// DeploymentStatusAnnotation is an annotation name used to retrieve the DeploymentPhase of
+	// a deployment.
+	// This is set on replication controller by deployer controller.
+	DeploymentStatusAnnotation = "openshift.io/deployment.phase"
+)
+
+type DeploymentConditionReason string
+
+var (
+	// ReplicationControllerUpdatedReason is added in a deployment config when one of its replication
+	// controllers is updated as part of the rollout process.
+	ReplicationControllerUpdatedReason DeploymentConditionReason = "ReplicationControllerUpdated"
+
+	// ReplicationControllerCreateError is added in a deployment config when it cannot create a new replication
+	// controller.
+	ReplicationControllerCreateErrorReason DeploymentConditionReason = "ReplicationControllerCreateError"
+
+	// ReplicationControllerCreatedReason is added in a deployment config when it creates a new replication
+	// controller.
+	NewReplicationControllerCreatedReason DeploymentConditionReason = "NewReplicationControllerCreated"
+
+	// NewReplicationControllerAvailableReason is added in a deployment config when its newest replication controller is made
+	// available ie. the number of new pods that have passed readiness checks and run for at least
+	// minReadySeconds is at least the minimum available pods that need to run for the deployment config.
+	NewReplicationControllerAvailableReason DeploymentConditionReason = "NewReplicationControllerAvailable"
+
+	// ProgressDeadlineExceededReason is added in a deployment config when its newest replication controller fails to show
+	// any progress within the given deadline (progressDeadlineSeconds).
+	ProgressDeadlineExceededReason DeploymentConditionReason = "ProgressDeadlineExceeded"
+
+	// DeploymentConfigPausedReason is added in a deployment config when it is paused. Lack of progress shouldn't be
+	// estimated once a deployment config is paused.
+	DeploymentConfigPausedReason DeploymentConditionReason = "DeploymentConfigPaused"
+
+	// DeploymentConfigResumedReason is added in a deployment config when it is resumed. Useful for not failing accidentally
+	// deployment configs that paused amidst a rollout.
+	DeploymentConfigResumedReason DeploymentConditionReason = "DeploymentConfigResumed"
+
+	// RolloutCancelledReason is added in a deployment config when its newest rollout was
+	// interrupted by cancellation.
+	RolloutCancelledReason DeploymentConditionReason = "RolloutCancelled"
+)
+
+// DeploymentStatus describes the possible states a deployment can be in.
+type DeploymentStatus string
+
+var (
+
+	// DeploymentStatusNew means the deployment has been accepted but not yet acted upon.
+	DeploymentStatusNew DeploymentStatus = "New"
+
+	// DeploymentStatusPending means the deployment been handed over to a deployment strategy,
+	// but the strategy has not yet declared the deployment to be running.
+	DeploymentStatusPending DeploymentStatus = "Pending"
+
+	// DeploymentStatusRunning means the deployment strategy has reported the deployment as
+	// being in-progress.
+	DeploymentStatusRunning DeploymentStatus = "Running"
+
+	// DeploymentStatusComplete means the deployment finished without an error.
+	DeploymentStatusComplete DeploymentStatus = "Complete"
+
+	// DeploymentStatusFailed means the deployment finished with an error.
+	DeploymentStatusFailed DeploymentStatus = "Failed"
+)

vendor/github.com/openshift/api/apps/v1/deprecated_consts.go

@@ -0,0 +1,38 @@
+package v1
+
+// This file contains consts that are not shared between components and set just internally.
+// They will likely be removed in (near) future.
+
+const (
+	// DeployerPodCreatedAtAnnotation is an annotation on a deployment that
+	// records the time in RFC3339 format of when the deployer pod for this particular
+	// deployment was created.
+	// This is set by deployer controller, but not consumed by any command or internally.
+	// DEPRECATED: will be removed soon
+	DeployerPodCreatedAtAnnotation = "openshift.io/deployer-pod.created-at"
+
+	// DeployerPodStartedAtAnnotation is an annotation on a deployment that
+	// records the time in RFC3339 format of when the deployer pod for this particular
+	// deployment was started.
+	// This is set by deployer controller, but not consumed by any command or internally.
+	// DEPRECATED: will be removed soon
+	DeployerPodStartedAtAnnotation = "openshift.io/deployer-pod.started-at"
+
+	// DeployerPodCompletedAtAnnotation is an annotation on deployment that records
+	// the time in RFC3339 format of when the deployer pod finished.
+	// This is set by deployer controller, but not consumed by any command or internally.
+	// DEPRECATED: will be removed soon
+	DeployerPodCompletedAtAnnotation = "openshift.io/deployer-pod.completed-at"
+
+	// DesiredReplicasAnnotation represents the desired number of replicas for a
+	// new deployment.
+	// This is set by deployer controller, but not consumed by any command or internally.
+	// DEPRECATED: will be removed soon
+	DesiredReplicasAnnotation = "kubectl.kubernetes.io/desired-replicas"
+
+	// DeploymentAnnotation is an annotation on a deployer Pod. The annotation value is the name
+	// of the deployment (a ReplicationController) on which the deployer Pod acts.
+	// This is set by deployer controller and consumed internally and in oc adm top command.
+	// DEPRECATED: will be removed soon
+	DeploymentAnnotation = "openshift.io/deployment.name"
+)

vendor/github.com/openshift/api/apps/v1/generated.proto

@@ -7,7 +7,6 @@ package github.com.openshift.api.apps.v1;
 
 import "k8s.io/api/core/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
-import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
 import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 
@@ -16,7 +15,7 @@ option go_package = "v1";
 
 // CustomDeploymentStrategyParams are the input to the Custom deployment strategy.
 message CustomDeploymentStrategyParams {
-  // Image specifies a Docker image which can carry out a deployment.
+  // Image specifies a container image which can carry out a deployment.
   optional string image = 1;
 
   // Environment holds the environment which will be given to the container for Image.
@@ -68,25 +67,24 @@ message DeploymentCondition {
 // A single deployment configuration is usually analogous to a single micro-service. Can support many different
 // deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as
 // well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.
-// 
+//
 // A deployment is "triggered" when its configuration is changed or a tag in an Image Stream is changed.
 // Triggers can be disabled to allow manual control over a deployment. The "strategy" determines how the deployment
 // is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment
 // is triggered by any means.
 message DeploymentConfig {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec represents a desired deployment state and how to deploy to it.
   optional DeploymentConfigSpec spec = 2;
 
   // Status represents the current deployment state.
+  // +optional
   optional DeploymentConfigStatus status = 3;
 }
 
 // DeploymentConfigList is a collection of deployment configs.
 message DeploymentConfigList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of deployment configs
@@ -362,7 +360,7 @@ message ExecNewPodHook {
   repeated k8s.io.api.core.v1.EnvVar env = 2;
 
   // ContainerName is the name of a container in the deployment pod template
-  // whose Docker image will be used for the hook pod's container.
+  // whose container image will be used for the hook pod's container.
   optional string containerName = 3;
 
   // Volumes is a list of named volumes from the pod template which should be
@@ -422,9 +420,9 @@ message RollingDeploymentStrategyParams {
   // during the update. Value can be an absolute number (ex: 5) or a
   // percentage of total pods at the start of update (ex: 10%). Absolute
   // number is calculated from percentage by rounding down.
-  // 
+  //
   // This cannot be 0 if MaxSurge is 0. By default, 25% is used.
-  // 
+  //
   // Example: when this is set to 30%, the old RC can be scaled down by 30%
   // immediately when the rolling update starts. Once new pods are ready, old
   // RC can be scaled down further, followed by scaling up the new RC,
@@ -436,9 +434,9 @@ message RollingDeploymentStrategyParams {
   // original number of pods. Value can be an absolute number (ex: 5) or a
   // percentage of total pods at the start of the update (ex: 10%). Absolute
   // number is calculated from percentage by rounding up.
-  // 
+  //
   // This cannot be 0 if MaxUnavailable is 0. By default, 25% is used.
-  // 
+  //
   // Example: when this is set to 30%, the new RC can be scaled up by 30%
   // immediately when the rolling update starts. Once old pods have been
   // killed, new RC can be scaled up further, ensuring that total number of

vendor/github.com/openshift/api/apps/v1/legacy.go

@@ -0,0 +1,28 @@
+package v1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+var (
+	legacyGroupVersion            = schema.GroupVersion{Group: "", Version: "v1"}
+	legacySchemeBuilder           = runtime.NewSchemeBuilder(addLegacyKnownTypes, corev1.AddToScheme, extensionsv1beta1.AddToScheme)
+	DeprecatedInstallWithoutGroup = legacySchemeBuilder.AddToScheme
+)
+
+func addLegacyKnownTypes(scheme *runtime.Scheme) error {
+	types := []runtime.Object{
+		&DeploymentConfig{},
+		&DeploymentConfigList{},
+		&DeploymentConfigRollback{},
+		&DeploymentRequest{},
+		&DeploymentLog{},
+		&DeploymentLogOptions{},
+		&extensionsv1beta1.Scale{},
+	}
+	scheme.AddKnownTypes(legacyGroupVersion, types...)
+	return nil
+}

vendor/github.com/openshift/api/apps/v1/register.go

@@ -1,50 +1,37 @@
 package v1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-const (
-	LegacyGroupName = ""
-	GroupName       = "apps.openshift.io"
-)
-
 var (
-	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
-	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
+	GroupName     = "apps.openshift.io"
+	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: "v1"}
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, corev1.AddToScheme, extensionsv1beta1.AddToScheme)
+	// Install is a function which adds this version to a scheme
+	Install = schemeBuilder.AddToScheme
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes)
-	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
-
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// SchemeGroupVersion generated code relies on this name
+	// Deprecated
+	SchemeGroupVersion = GroupVersion
+	// AddToScheme exists solely to keep the old generators creating valid code
+	// DEPRECATED
+	AddToScheme = schemeBuilder.AddToScheme
 )
 
+// Resource generated code relies on this being here, but it logically belongs to the group
+// DEPRECATED
 func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
-}
-
-// Adds the list of known types to api.Scheme.
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	types := []runtime.Object{
-		&DeploymentConfig{},
-		&DeploymentConfigList{},
-		&DeploymentConfigRollback{},
-		&DeploymentRequest{},
-		&DeploymentLog{},
-		&DeploymentLogOptions{},
-		&extensionsv1beta1.Scale{},
-	}
-	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
-	return nil
+	return schema.GroupResource{Group: GroupName, Resource: resource}
 }
 
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(GroupVersion,
 		&DeploymentConfig{},
 		&DeploymentConfigList{},
 		&DeploymentConfigRollback{},
@@ -53,6 +40,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&DeploymentLogOptions{},
 		&extensionsv1beta1.Scale{},
 	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
 	return nil
 }

vendor/github.com/openshift/api/apps/v1/types.go

@@ -25,14 +25,14 @@ import (
 // is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment
 // is triggered by any means.
 type DeploymentConfig struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec represents a desired deployment state and how to deploy to it.
 	Spec DeploymentConfigSpec `json:"spec" protobuf:"bytes,2,opt,name=spec"`
 
 	// Status represents the current deployment state.
+	// +optional
 	Status DeploymentConfigStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"`
 }
 
@@ -120,7 +120,7 @@ const (
 
 // CustomDeploymentStrategyParams are the input to the Custom deployment strategy.
 type CustomDeploymentStrategyParams struct {
-	// Image specifies a Docker image which can carry out a deployment.
+	// Image specifies a container image which can carry out a deployment.
 	Image string `json:"image,omitempty" protobuf:"bytes,1,opt,name=image"`
 	// Environment holds the environment which will be given to the container for Image.
 	Environment []corev1.EnvVar `json:"environment,omitempty" protobuf:"bytes,2,rep,name=environment"`
@@ -225,7 +225,7 @@ type ExecNewPodHook struct {
 	// Env is a set of environment variables to supply to the hook pod's container.
 	Env []corev1.EnvVar `json:"env,omitempty" protobuf:"bytes,2,rep,name=env"`
 	// ContainerName is the name of a container in the deployment pod template
-	// whose Docker image will be used for the hook pod's container.
+	// whose container image will be used for the hook pod's container.
 	ContainerName string `json:"containerName" protobuf:"bytes,3,opt,name=containerName"`
 	// Volumes is a list of named volumes from the pod template which should be
 	// copied to the hook pod. Volumes names not found in pod spec are ignored.
@@ -264,7 +264,7 @@ type DeploymentTriggerType string
 
 const (
 	// DeploymentTriggerOnImageChange will create new deployments in response to updated tags from
-	// a Docker image repository.
+	// a container image repository.
 	DeploymentTriggerOnImageChange DeploymentTriggerType = "ImageChange"
 	// DeploymentTriggerOnConfigChange will create new deployments in response to changes to
 	// the ControllerTemplate of a DeploymentConfig.
@@ -389,7 +389,6 @@ type DeploymentCondition struct {
 // DeploymentConfigList is a collection of deployment configs.
 type DeploymentConfigList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of deployment configs

vendor/github.com/openshift/api/apps/v1/zz_generated.deepcopy.go

@@ -1,15 +1,13 @@
 // +build !ignore_autogenerated
 
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+// Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v1
 
 import (
-	core_v1 "k8s.io/api/core/v1"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/api/core/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	intstr "k8s.io/apimachinery/pkg/util/intstr"
-	unsafe "unsafe"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -17,7 +15,7 @@ func (in *CustomDeploymentStrategyParams) DeepCopyInto(out *CustomDeploymentStra
 	*out = *in
 	if in.Environment != nil {
 		in, out := &in.Environment, &out.Environment
-		*out = make([]core_v1.EnvVar, len(*in))
+		*out = make([]corev1.EnvVar, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -45,12 +43,8 @@ func (in *DeploymentCause) DeepCopyInto(out *DeploymentCause) {
 	*out = *in
 	if in.ImageTrigger != nil {
 		in, out := &in.ImageTrigger, &out.ImageTrigger
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(DeploymentCauseImageTrigger)
-			**out = **in
-		}
+		*out = new(DeploymentCauseImageTrigger)
+		**out = **in
 	}
 	return
 }
@@ -100,26 +94,6 @@ func (in *DeploymentCondition) DeepCopy() *DeploymentCondition {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeploymentConditionType) DeepCopyInto(out *DeploymentConditionType) {
-	{
-		in := (*string)(unsafe.Pointer(in))
-		out := (*string)(unsafe.Pointer(out))
-		*out = *in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeploymentConditionType.
-func (in *DeploymentConditionType) DeepCopy() *DeploymentConditionType {
-	if in == nil {
-		return nil
-	}
-	out := new(DeploymentConditionType)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeploymentConfig) DeepCopyInto(out *DeploymentConfig) {
 	*out = *in
@@ -144,16 +118,15 @@ func (in *DeploymentConfig) DeepCopy() *DeploymentConfig {
 func (in *DeploymentConfig) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeploymentConfigList) DeepCopyInto(out *DeploymentConfigList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]DeploymentConfig, len(*in))
@@ -178,9 +151,8 @@ func (in *DeploymentConfigList) DeepCopy() *DeploymentConfigList {
 func (in *DeploymentConfigList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -212,9 +184,8 @@ func (in *DeploymentConfigRollback) DeepCopy() *DeploymentConfigRollback {
 func (in *DeploymentConfigRollback) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -247,12 +218,8 @@ func (in *DeploymentConfigSpec) DeepCopyInto(out *DeploymentConfigSpec) {
 	}
 	if in.RevisionHistoryLimit != nil {
 		in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int32)
-			**out = **in
-		}
+		*out = new(int32)
+		**out = **in
 	}
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
@@ -263,12 +230,8 @@ func (in *DeploymentConfigSpec) DeepCopyInto(out *DeploymentConfigSpec) {
 	}
 	if in.Template != nil {
 		in, out := &in.Template, &out.Template
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(core_v1.PodTemplateSpec)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(corev1.PodTemplateSpec)
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
@@ -288,12 +251,8 @@ func (in *DeploymentConfigStatus) DeepCopyInto(out *DeploymentConfigStatus) {
 	*out = *in
 	if in.Details != nil {
 		in, out := &in.Details, &out.Details
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(DeploymentDetails)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(DeploymentDetails)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
@@ -359,9 +318,8 @@ func (in *DeploymentLog) DeepCopy() *DeploymentLog {
 func (in *DeploymentLog) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -370,48 +328,27 @@ func (in *DeploymentLogOptions) DeepCopyInto(out *DeploymentLogOptions) {
 	out.TypeMeta = in.TypeMeta
 	if in.SinceSeconds != nil {
 		in, out := &in.SinceSeconds, &out.SinceSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.SinceTime != nil {
 		in, out := &in.SinceTime, &out.SinceTime
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(meta_v1.Time)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = (*in).DeepCopy()
 	}
 	if in.TailLines != nil {
 		in, out := &in.TailLines, &out.TailLines
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.LimitBytes != nil {
 		in, out := &in.LimitBytes, &out.LimitBytes
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.Version != nil {
 		in, out := &in.Version, &out.Version
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	return
 }
@@ -430,9 +367,8 @@ func (in *DeploymentLogOptions) DeepCopy() *DeploymentLogOptions {
 func (in *DeploymentLogOptions) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -461,9 +397,8 @@ func (in *DeploymentRequest) DeepCopy() *DeploymentRequest {
 func (in *DeploymentRequest) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -471,30 +406,18 @@ func (in *DeploymentStrategy) DeepCopyInto(out *DeploymentStrategy) {
 	*out = *in
 	if in.CustomParams != nil {
 		in, out := &in.CustomParams, &out.CustomParams
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(CustomDeploymentStrategyParams)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(CustomDeploymentStrategyParams)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.RecreateParams != nil {
 		in, out := &in.RecreateParams, &out.RecreateParams
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(RecreateDeploymentStrategyParams)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(RecreateDeploymentStrategyParams)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.RollingParams != nil {
 		in, out := &in.RollingParams, &out.RollingParams
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(RollingDeploymentStrategyParams)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(RollingDeploymentStrategyParams)
+		(*in).DeepCopyInto(*out)
 	}
 	in.Resources.DeepCopyInto(&out.Resources)
 	if in.Labels != nil {
@@ -513,12 +436,8 @@ func (in *DeploymentStrategy) DeepCopyInto(out *DeploymentStrategy) {
 	}
 	if in.ActiveDeadlineSeconds != nil {
 		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	return
 }
@@ -533,26 +452,6 @@ func (in *DeploymentStrategy) DeepCopy() *DeploymentStrategy {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeploymentStrategyType) DeepCopyInto(out *DeploymentStrategyType) {
-	{
-		in := (*string)(unsafe.Pointer(in))
-		out := (*string)(unsafe.Pointer(out))
-		*out = *in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeploymentStrategyType.
-func (in *DeploymentStrategyType) DeepCopy() *DeploymentStrategyType {
-	if in == nil {
-		return nil
-	}
-	out := new(DeploymentStrategyType)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeploymentTriggerImageChangeParams) DeepCopyInto(out *DeploymentTriggerImageChangeParams) {
 	*out = *in
@@ -576,26 +475,25 @@ func (in *DeploymentTriggerImageChangeParams) DeepCopy() *DeploymentTriggerImage
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeploymentTriggerPolicies) DeepCopyInto(out *DeploymentTriggerPolicies) {
+func (in DeploymentTriggerPolicies) DeepCopyInto(out *DeploymentTriggerPolicies) {
 	{
-		in := (*[]DeploymentTriggerPolicy)(unsafe.Pointer(in))
-		out := (*[]DeploymentTriggerPolicy)(unsafe.Pointer(out))
-		*out = make([]DeploymentTriggerPolicy, len(*in))
+		in := &in
+		*out = make(DeploymentTriggerPolicies, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
+		return
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeploymentTriggerPolicies.
-func (in *DeploymentTriggerPolicies) DeepCopy() *DeploymentTriggerPolicies {
+func (in DeploymentTriggerPolicies) DeepCopy() DeploymentTriggerPolicies {
 	if in == nil {
 		return nil
 	}
 	out := new(DeploymentTriggerPolicies)
 	in.DeepCopyInto(out)
-	return out
+	return *out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -603,12 +501,8 @@ func (in *DeploymentTriggerPolicy) DeepCopyInto(out *DeploymentTriggerPolicy) {
 	*out = *in
 	if in.ImageChangeParams != nil {
 		in, out := &in.ImageChangeParams, &out.ImageChangeParams
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(DeploymentTriggerImageChangeParams)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(DeploymentTriggerImageChangeParams)
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
@@ -623,26 +517,6 @@ func (in *DeploymentTriggerPolicy) DeepCopy() *DeploymentTriggerPolicy {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeploymentTriggerType) DeepCopyInto(out *DeploymentTriggerType) {
-	{
-		in := (*string)(unsafe.Pointer(in))
-		out := (*string)(unsafe.Pointer(out))
-		*out = *in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeploymentTriggerType.
-func (in *DeploymentTriggerType) DeepCopy() *DeploymentTriggerType {
-	if in == nil {
-		return nil
-	}
-	out := new(DeploymentTriggerType)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ExecNewPodHook) DeepCopyInto(out *ExecNewPodHook) {
 	*out = *in
@@ -653,7 +527,7 @@ func (in *ExecNewPodHook) DeepCopyInto(out *ExecNewPodHook) {
 	}
 	if in.Env != nil {
 		in, out := &in.Env, &out.Env
-		*out = make([]core_v1.EnvVar, len(*in))
+		*out = make([]corev1.EnvVar, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -681,12 +555,8 @@ func (in *LifecycleHook) DeepCopyInto(out *LifecycleHook) {
 	*out = *in
 	if in.ExecNewPod != nil {
 		in, out := &in.ExecNewPod, &out.ExecNewPod
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(ExecNewPodHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(ExecNewPodHook)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.TagImages != nil {
 		in, out := &in.TagImages, &out.TagImages
@@ -706,64 +576,28 @@ func (in *LifecycleHook) DeepCopy() *LifecycleHook {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *LifecycleHookFailurePolicy) DeepCopyInto(out *LifecycleHookFailurePolicy) {
-	{
-		in := (*string)(unsafe.Pointer(in))
-		out := (*string)(unsafe.Pointer(out))
-		*out = *in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LifecycleHookFailurePolicy.
-func (in *LifecycleHookFailurePolicy) DeepCopy() *LifecycleHookFailurePolicy {
-	if in == nil {
-		return nil
-	}
-	out := new(LifecycleHookFailurePolicy)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RecreateDeploymentStrategyParams) DeepCopyInto(out *RecreateDeploymentStrategyParams) {
 	*out = *in
 	if in.TimeoutSeconds != nil {
 		in, out := &in.TimeoutSeconds, &out.TimeoutSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.Pre != nil {
 		in, out := &in.Pre, &out.Pre
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(LifecycleHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(LifecycleHook)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Mid != nil {
 		in, out := &in.Mid, &out.Mid
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(LifecycleHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(LifecycleHook)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Post != nil {
 		in, out := &in.Post, &out.Post
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(LifecycleHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(LifecycleHook)
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
@@ -783,66 +617,38 @@ func (in *RollingDeploymentStrategyParams) DeepCopyInto(out *RollingDeploymentSt
 	*out = *in
 	if in.UpdatePeriodSeconds != nil {
 		in, out := &in.UpdatePeriodSeconds, &out.UpdatePeriodSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.IntervalSeconds != nil {
 		in, out := &in.IntervalSeconds, &out.IntervalSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.TimeoutSeconds != nil {
 		in, out := &in.TimeoutSeconds, &out.TimeoutSeconds
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.MaxUnavailable != nil {
 		in, out := &in.MaxUnavailable, &out.MaxUnavailable
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(intstr.IntOrString)
-			**out = **in
-		}
+		*out = new(intstr.IntOrString)
+		**out = **in
 	}
 	if in.MaxSurge != nil {
 		in, out := &in.MaxSurge, &out.MaxSurge
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(intstr.IntOrString)
-			**out = **in
-		}
+		*out = new(intstr.IntOrString)
+		**out = **in
 	}
 	if in.Pre != nil {
 		in, out := &in.Pre, &out.Pre
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(LifecycleHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(LifecycleHook)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Post != nil {
 		in, out := &in.Post, &out.Post
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(LifecycleHook)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(LifecycleHook)
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }

vendor/github.com/openshift/api/apps/v1/zz_generated.swagger_doc_generated.go

@@ -8,12 +8,12 @@ package v1
 // they are on one line! For multiple line or blocks that you want to ignore use ---.
 // Any context after a --- is ignored.
 //
-// Those methods can be generated by using hack/update-generated-swagger-docs.sh
+// Those methods can be generated by using hack/update-swagger-docs.sh
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_CustomDeploymentStrategyParams = map[string]string{
 	"":            "CustomDeploymentStrategyParams are the input to the Custom deployment strategy.",
-	"image":       "Image specifies a Docker image which can carry out a deployment.",
+	"image":       "Image specifies a container image which can carry out a deployment.",
 	"environment": "Environment holds the environment which will be given to the container for Image.",
 	"command":     "Command is optional and overrides CMD in the container Image.",
 }
@@ -56,10 +56,9 @@ func (DeploymentCondition) SwaggerDoc() map[string]string {
 }
 
 var map_DeploymentConfig = map[string]string{
-	"":         "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 deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec represents a desired deployment state and how to deploy to it.",
-	"status":   "Status represents the current deployment state.",
+	"":       "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 deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
+	"spec":   "Spec represents a desired deployment state and how to deploy to it.",
+	"status": "Status represents the current deployment state.",
 }
 
 func (DeploymentConfig) SwaggerDoc() map[string]string {
@@ -67,9 +66,8 @@ func (DeploymentConfig) SwaggerDoc() map[string]string {
 }
 
 var map_DeploymentConfigList = map[string]string{
-	"":         "DeploymentConfigList is a collection of deployment configs.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of deployment configs",
+	"":      "DeploymentConfigList is a collection of deployment configs.",
+	"items": "Items is a list of deployment configs",
 }
 
 func (DeploymentConfigList) SwaggerDoc() map[string]string {
@@ -225,7 +223,7 @@ var map_ExecNewPodHook = map[string]string{
 	"":              "ExecNewPodHook is a hook implementation which runs a command in a new pod based on the specified container which is assumed to be part of the deployment template.",
 	"command":       "Command is the action command and its arguments.",
 	"env":           "Env is a set of environment variables to supply to the hook pod's container.",
-	"containerName": "ContainerName is the name of a container in the deployment pod template whose Docker image will be used for the hook pod's container.",
+	"containerName": "ContainerName is the name of a container in the deployment pod template whose container image will be used for the hook pod's container.",
 	"volumes":       "Volumes is a list of named volumes from the pod template which should be copied to the hook pod. Volumes names not found in pod spec are ignored. An empty list means no volumes will be copied.",
 }
 
@@ -257,7 +255,7 @@ func (RecreateDeploymentStrategyParams) SwaggerDoc() map[string]string {
 }
 
 var map_RollingDeploymentStrategyParams = map[string]string{
-	"": "RollingDeploymentStrategyParams are the input to the Rolling deployment strategy.",
+	"":                    "RollingDeploymentStrategyParams are the input to the Rolling deployment strategy.",
 	"updatePeriodSeconds": "UpdatePeriodSeconds is the time to wait between individual pod updates. If the value is nil, a default will be used.",
 	"intervalSeconds":     "IntervalSeconds is the time to wait between polling deployment status after update. If the value is nil, a default will be used.",
 	"timeoutSeconds":      "TimeoutSeconds is the time to wait for updates before giving up. If the value is nil, a default will be used.",