Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate field in replicasummary #716

Merged
merged 3 commits into from
Jan 8, 2025
Merged

Remove duplicate field in replicasummary #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03d1d54
remove StartTime and use existing ContainerStarted instead since they…
nilsgstrabo Jan 7, 2025
2bf37dd
remove deprecated and unused fields
nilsgstrabo Jan 7, 2025
9171527
generate swagger
nilsgstrabo Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions api/deployments/models/component_deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,6 @@ type ReplicaSummary struct {
// swagger:strfmt date-time
Created time.Time `json:"created"`

// The time at which the batch job's pod startedAt
//
// required: false
// swagger:strfmt date-time
StartTime *time.Time `json:"startTime"`

// The time at which the batch job's pod finishedAt.
//
// required: false
Expand Down
11 changes: 0 additions & 11 deletions api/deployments/models/scheduled_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,6 @@ type ScheduledBatchSummary struct {
// example: Waiting
Status ScheduledBatchJobStatus `json:"status"`

// Deprecated: Message of a status, if any, of the job
//
// required: false
// example: "Error occurred"
Message string `json:"message,omitempty"`

// Deprecated: ReplicaSummary
//
// required: false
Replica *ReplicaSummary `json:"replica,omitempty"`

// TotalJobCount count of jobs, requested to be scheduled by a batch
//
// required: true
Expand Down
2 changes: 1 addition & 1 deletion api/models/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func GetReplicaSummaryByJobPodStatus(radixBatchJob radixv1.RadixBatchJob, jobPod
Status: models.ReplicaStatus{Status: getReplicaStatusByPodStatus(jobPodStatus.Phase)},
}
if jobPodStatus.StartTime != nil {
summary.StartTime = &jobPodStatus.StartTime.Time
summary.ContainerStarted = &jobPodStatus.StartTime.Time
}
if jobPodStatus.EndTime != nil {
summary.EndTime = &jobPodStatus.EndTime.Time
Expand Down
15 changes: 0 additions & 15 deletions swaggerui/html/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7926,12 +7926,6 @@
"format": "int32",
"x-go-name": "RestartCount"
},
"startTime": {
"description": "The time at which the batch job's pod startedAt",
"type": "string",
"format": "date-time",
"x-go-name": "StartTime"
},
"statusMessage": {
"description": "StatusMessage provides message describing the status of a component container inside a pod",
"type": "string",
Expand Down Expand Up @@ -8047,21 +8041,12 @@
},
"x-go-name": "JobList"
},
"message": {
"description": "Deprecated: Message of a status, if any, of the job",
"type": "string",
"x-go-name": "Message",
"example": "\"Error occurred\""
},
"name": {
"description": "Name of the scheduled batch",
"type": "string",
"x-go-name": "Name",
"example": "batch-20181029135644-algpv-6hznh"
},
"replica": {
"$ref": "#/definitions/ReplicaSummary"
},
"started": {
"description": "Started timestamp",
"type": "string",
Expand Down
Loading