diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json index bc3b2dd4c355..1f0a9a5e1da1 100644 --- a/api/swagger-spec/oapi-v1.json +++ b/api/swagger-spec/oapi-v1.json @@ -21797,16 +21797,36 @@ "latestVersion": { "type": "integer", "format": "int64", - "description": "LatestVersion is used to determine whether the current deployment associated with a DeploymentConfig is out of sync." - }, - "details": { - "$ref": "v1.DeploymentDetails", - "description": "Details are the reasons for the update to this deployment config. This could be based on a change made by the user or caused by an automatic trigger" + "description": "LatestVersion is used to determine whether the current deployment associated with a deployment config is out of sync." }, "observedGeneration": { "type": "integer", "format": "int64", - "description": "ObservedGeneration is the most recent generation observed by the controller." + "description": "ObservedGeneration is the most recent generation observed by the deployment config controller." + }, + "replicas": { + "type": "integer", + "format": "int32", + "description": "Replicas is the total number of pods targeted by this deployment config." + }, + "updatedReplicas": { + "type": "integer", + "format": "int32", + "description": "UpdatedReplicas is the total number of non-terminated pods targeted by this deployment config that have the desired template spec." + }, + "availableReplicas": { + "type": "integer", + "format": "int32", + "description": "AvailableReplicas is the total number of available pods targeted by this deployment config." + }, + "unavailableReplicas": { + "type": "integer", + "format": "int32", + "description": "UnavailableReplicas is the total number of unavailable pods targeted by this deployment config." + }, + "details": { + "$ref": "v1.DeploymentDetails", + "description": "Details are the reasons for the update to this deployment config. This could be based on a change made by the user or caused by an automatic trigger" } } }, diff --git a/pkg/deploy/api/deep_copy_generated.go b/pkg/deploy/api/deep_copy_generated.go index 65da1d2d3690..f4db5804c59c 100644 --- a/pkg/deploy/api/deep_copy_generated.go +++ b/pkg/deploy/api/deep_copy_generated.go @@ -184,6 +184,11 @@ func DeepCopy_api_DeploymentConfigSpec(in DeploymentConfigSpec, out *DeploymentC func DeepCopy_api_DeploymentConfigStatus(in DeploymentConfigStatus, out *DeploymentConfigStatus, c *conversion.Cloner) error { out.LatestVersion = in.LatestVersion + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas if in.Details != nil { in, out := in.Details, &out.Details *out = new(DeploymentDetails) @@ -193,7 +198,6 @@ func DeepCopy_api_DeploymentConfigStatus(in DeploymentConfigStatus, out *Deploym } else { out.Details = nil } - out.ObservedGeneration = in.ObservedGeneration return nil } diff --git a/pkg/deploy/api/v1/conversion_generated.go b/pkg/deploy/api/v1/conversion_generated.go index b998dd6fc63d..5b7649abf795 100644 --- a/pkg/deploy/api/v1/conversion_generated.go +++ b/pkg/deploy/api/v1/conversion_generated.go @@ -420,6 +420,11 @@ func Convert_api_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *deploy_api. func autoConvert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *DeploymentConfigStatus, out *deploy_api.DeploymentConfigStatus, s conversion.Scope) error { out.LatestVersion = in.LatestVersion + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas if in.Details != nil { in, out := &in.Details, &out.Details *out = new(deploy_api.DeploymentDetails) @@ -429,7 +434,6 @@ func autoConvert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *Dep } else { out.Details = nil } - out.ObservedGeneration = in.ObservedGeneration return nil } @@ -439,6 +443,11 @@ func Convert_v1_DeploymentConfigStatus_To_api_DeploymentConfigStatus(in *Deploym func autoConvert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(in *deploy_api.DeploymentConfigStatus, out *DeploymentConfigStatus, s conversion.Scope) error { out.LatestVersion = in.LatestVersion + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas if in.Details != nil { in, out := &in.Details, &out.Details *out = new(DeploymentDetails) @@ -448,7 +457,6 @@ func autoConvert_api_DeploymentConfigStatus_To_v1_DeploymentConfigStatus(in *dep } else { out.Details = nil } - out.ObservedGeneration = in.ObservedGeneration return nil } diff --git a/pkg/deploy/api/v1/deep_copy_generated.go b/pkg/deploy/api/v1/deep_copy_generated.go index 0a9b1e57a71c..0ce6b9ab55f5 100644 --- a/pkg/deploy/api/v1/deep_copy_generated.go +++ b/pkg/deploy/api/v1/deep_copy_generated.go @@ -183,6 +183,11 @@ func DeepCopy_v1_DeploymentConfigSpec(in DeploymentConfigSpec, out *DeploymentCo func DeepCopy_v1_DeploymentConfigStatus(in DeploymentConfigStatus, out *DeploymentConfigStatus, c *conversion.Cloner) error { out.LatestVersion = in.LatestVersion + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas if in.Details != nil { in, out := in.Details, &out.Details *out = new(DeploymentDetails) @@ -192,7 +197,6 @@ func DeepCopy_v1_DeploymentConfigStatus(in DeploymentConfigStatus, out *Deployme } else { out.Details = nil } - out.ObservedGeneration = in.ObservedGeneration return nil } diff --git a/pkg/deploy/api/v1/swagger_doc.go b/pkg/deploy/api/v1/swagger_doc.go index 2fcc5f3fd90a..f785780ff1c9 100644 --- a/pkg/deploy/api/v1/swagger_doc.go +++ b/pkg/deploy/api/v1/swagger_doc.go @@ -94,10 +94,14 @@ func (DeploymentConfigSpec) SwaggerDoc() map[string]string { } var map_DeploymentConfigStatus = map[string]string{ - "": "DeploymentConfigStatus represents the current deployment state.", - "latestVersion": "LatestVersion is used to determine whether the current deployment associated with a DeploymentConfig is out of sync.", - "details": "Details are the reasons for the update to this deployment config. This could be based on a change made by the user or caused by an automatic trigger", - "observedGeneration": "ObservedGeneration is the most recent generation observed by the controller.", + "": "DeploymentConfigStatus represents the current deployment state.", + "latestVersion": "LatestVersion is used to determine whether the current deployment associated with a deployment config is out of sync.", + "observedGeneration": "ObservedGeneration is the most recent generation observed by the deployment config controller.", + "replicas": "Replicas is the total number of pods targeted by this deployment config.", + "updatedReplicas": "UpdatedReplicas is the total number of non-terminated pods targeted by this deployment config that have the desired template spec.", + "availableReplicas": "AvailableReplicas is the total number of available pods targeted by this deployment config.", + "unavailableReplicas": "UnavailableReplicas is the total number of unavailable pods targeted by this deployment config.", + "details": "Details are the reasons for the update to this deployment config. This could be based on a change made by the user or caused by an automatic trigger", } func (DeploymentConfigStatus) SwaggerDoc() map[string]string {