github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

fix RemoveStatusCondition（） cap out of range

Browse Source
This commit is contained in:
lala123912 2021-03-04 11:53:24 +08:00
parent 4f9317596c
commit b96e7f5a8a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apimachinery/pkg/api/meta/conditions.go
View File

@ -57,7 +57,7 @@ func SetStatusCondition(conditions *[]metav1.Condition, newCondition metav1.Cond
// RemoveStatusCondition removes the corresponding conditionType from conditions.
// conditions must be non-nil.
func RemoveStatusCondition(conditions *[]metav1.Condition, conditionType string) {
if conditions == nil {
if conditions == nil || len(*conditions) == 0 {
return
}
newConditions := make([]metav1.Condition, 0, len(*conditions)-1)

6
staging/src/k8s.io/apimachinery/pkg/api/meta/conditions_test.go
View File

@ -121,6 +121,12 @@ func TestRemoveStatusCondition(t *testing.T) {
{Type: "third"},
},
},
{
name: "empty_conditions",
conditions: []metav1.Condition{},
conditionType: "Foo",
expected: []metav1.Condition{},
},
}
for _, test := range tests {