Skip to content

Commit

Permalink
Merge pull request openshift#833 from sttts/sttts-static-pods-last-fa…
Browse files Browse the repository at this point in the history
…iled-count-and-time

Bug 1909600: operator/v1: add time and count for failed static pod revisions
  • Loading branch information
openshift-merge-robot authored Jan 18, 2021
2 parents 2be429e + 7a0781d commit 5935a5b
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 1 deletion.
9 changes: 9 additions & 0 deletions operator/v1/0000_12_etcd-operator_01_config.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ spec:
successful deployment
type: integer
format: int32
lastFailedCount:
description: lastFailedCount is how often the last failed revision
failed.
type: integer
lastFailedRevision:
description: lastFailedRevision is the generation of the deployment
we tried and failed to deploy.
Expand All @@ -198,6 +202,11 @@ spec:
type: array
items:
type: string
lastFailedTime:
description: lastFailedTime is the time the last failed revision
failed the last time.
type: string
format: date-time
nodeName:
description: nodeName is the name of the node
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ spec:
successful deployment
format: int32
type: integer
lastFailedCount:
description: lastFailedCount is how often the last failed revision
failed.
type: integer
lastFailedRevision:
description: lastFailedRevision is the generation of the deployment
we tried and failed to deploy.
Expand All @@ -190,6 +194,11 @@ spec:
items:
type: string
type: array
lastFailedTime:
description: lastFailedTime is the time the last failed revision
failed the last time.
format: date-time
type: string
nodeName:
description: nodeName is the name of the node
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ spec:
successful deployment
format: int32
type: integer
lastFailedCount:
description: lastFailedCount is how often the last failed revision
failed.
type: integer
lastFailedRevision:
description: lastFailedRevision is the generation of the deployment
we tried and failed to deploy.
Expand All @@ -192,6 +196,11 @@ spec:
items:
type: string
type: array
lastFailedTime:
description: lastFailedTime is the time the last failed revision
failed the last time.
format: date-time
type: string
nodeName:
description: nodeName is the name of the node
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@ spec:
successful deployment
format: int32
type: integer
lastFailedCount:
description: lastFailedCount is how often the last failed revision
failed.
type: integer
lastFailedRevision:
description: lastFailedRevision is the generation of the deployment
we tried and failed to deploy.
Expand All @@ -192,6 +196,11 @@ spec:
items:
type: string
type: array
lastFailedTime:
description: lastFailedTime is the time the last failed revision
failed the last time.
format: date-time
type: string
nodeName:
description: nodeName is the name of the node
type: string
Expand Down
6 changes: 5 additions & 1 deletion operator/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,13 @@ type NodeStatus struct {
CurrentRevision int32 `json:"currentRevision"`
// targetRevision is the generation of the deployment we're trying to apply
TargetRevision int32 `json:"targetRevision,omitempty"`

// lastFailedRevision is the generation of the deployment we tried and failed to deploy.
LastFailedRevision int32 `json:"lastFailedRevision,omitempty"`

// lastFailedTime is the time the last failed revision failed the last time.
LastFailedTime *metav1.Time `json:"lastFailedTime,omitempty"`
// lastFailedCount is how often the last failed revision failed.
LastFailedCount int `json:"lastFailedCount,omitempty"`
// lastFailedRevisionErrors is a list of the errors during the failed deployment referenced in lastFailedRevision
LastFailedRevisionErrors []string `json:"lastFailedRevisionErrors,omitempty"`
}
4 changes: 4 additions & 0 deletions operator/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions operator/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5935a5b

Please sign in to comment.