Skip to content

Commit

Permalink
Merge pull request #63757 from nak3/disruptedPods-optional
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 63757, 67698, 67712, 67494, 67700). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Make DisruptedPods in PodDisruptionBudgetStatus optional field

**What this PR does / why we need it**:

Please refer to kubernetes/kubernetes#63756

**Which issue(s) this PR fixes**

Fixes kubernetes/kubernetes#63756

**Release note**:

```release-note
NONE
```

Kubernetes-commit: e98bf0fb521ee7bb1ca3d1e7098169abc4b509bd
  • Loading branch information
k8s-publishing-bot committed Aug 22, 2018
2 parents 167b583 + 57ac6f0 commit e393424
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 38 deletions.
74 changes: 37 additions & 37 deletions Godeps/Godeps.json

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

1 change: 1 addition & 0 deletions policy/v1beta1/generated.proto

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

3 changes: 2 additions & 1 deletion policy/v1beta1/types.go
Expand Up @@ -60,7 +60,8 @@ type PodDisruptionBudgetStatus struct {
// the list automatically by PodDisruptionBudget controller after some time.
// If everything goes smooth this map should be empty for the most of the time.
// Large number of entries in the map may indicate problems with pod deletions.
DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,2,rep,name=disruptedPods"`
// +optional
DisruptedPods map[string]metav1.Time `json:"disruptedPods,omitempty" protobuf:"bytes,2,rep,name=disruptedPods"`

// Number of pod disruptions that are currently allowed.
PodDisruptionsAllowed int32 `json:"disruptionsAllowed" protobuf:"varint,3,opt,name=disruptionsAllowed"`
Expand Down

0 comments on commit e393424

Please sign in to comment.