github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

fix namespace termination conditions to be consistent and correct

Browse Source
This commit is contained in:
David Eads
2019-09-03 14:01:49 -04:00
parent 975d0736b3
commit 076bf949d7
9 changed files with 454 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
pkg/controller/namespace/deletion/status_condition_utils_test.go Normal file
View File

@@ -0,0 +1,137 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package deletion
import (
"reflect"
"testing"
v1 "k8s.io/api/core/v1"
)
func TestUpdateConditions(t *testing.T) {
tests := []struct {
name string
newConditions []v1.NamespaceCondition
startingStatus *v1.NamespaceStatus
expecteds []v1.NamespaceCondition
}{
{
name: "leave unknown",
newConditions: []v1.NamespaceCondition{},
startingStatus: &v1.NamespaceStatus{
Conditions: []v1.NamespaceCondition{
{Type: "unknown", Status: v1.ConditionTrue},
},
},
expecteds: []v1.NamespaceCondition{
{Type: "unknown", Status: v1.ConditionTrue},
*newSuccessfulCondition(v1.NamespaceDeletionDiscoveryFailure),
*newSuccessfulCondition(v1.NamespaceDeletionGVParsingFailure),
*newSuccessfulCondition(v1.NamespaceDeletionContentFailure),
},
},
{
name: "replace with success",
newConditions: []v1.NamespaceCondition{},
startingStatus: &v1.NamespaceStatus{
Conditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionDiscoveryFailure, Status: v1.ConditionTrue},
},
},
expecteds: []v1.NamespaceCondition{
*newSuccessfulCondition(v1.NamespaceDeletionDiscoveryFailure),
*newSuccessfulCondition(v1.NamespaceDeletionGVParsingFailure),
*newSuccessfulCondition(v1.NamespaceDeletionContentFailure),
},
},
{
name: "leave different order",
newConditions: []v1.NamespaceCondition{},
startingStatus: &v1.NamespaceStatus{
Conditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionTrue},
{Type: v1.NamespaceDeletionDiscoveryFailure, Status: v1.ConditionTrue},
},
},
expecteds: []v1.NamespaceCondition{
*newSuccessfulCondition(v1.NamespaceDeletionGVParsingFailure),
*newSuccessfulCondition(v1.NamespaceDeletionDiscoveryFailure),
*newSuccessfulCondition(v1.NamespaceDeletionContentFailure),
},
},
{
name: "overwrite with failure",
newConditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionTrue, Reason: "foo", Message: "bar"},
},
startingStatus: &v1.NamespaceStatus{
Conditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionFalse},
{Type: v1.NamespaceDeletionDiscoveryFailure, Status: v1.ConditionTrue},
},
},
expecteds: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionTrue, Reason: "foo", Message: "bar"},
*newSuccessfulCondition(v1.NamespaceDeletionDiscoveryFailure),
*newSuccessfulCondition(v1.NamespaceDeletionContentFailure),
},
},
{
name: "write new failure",
newConditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionTrue, Reason: "foo", Message: "bar"},
},
startingStatus: &v1.NamespaceStatus{
Conditions: []v1.NamespaceCondition{
{Type: v1.NamespaceDeletionDiscoveryFailure, Status: v1.ConditionTrue},
},
},
expecteds: []v1.NamespaceCondition{
*newSuccessfulCondition(v1.NamespaceDeletionDiscoveryFailure),
{Type: v1.NamespaceDeletionGVParsingFailure, Status: v1.ConditionTrue, Reason: "foo", Message: "bar"},
*newSuccessfulCondition(v1.NamespaceDeletionContentFailure),
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
updateConditions(test.startingStatus, test.newConditions)
actuals := test.startingStatus.Conditions
if len(actuals) != len(test.expecteds) {
t.Fatal(actuals)
}
for i := range actuals {
actual := actuals[i]
expected := test.expecteds[i]
expected.LastTransitionTime = actual.LastTransitionTime
if !reflect.DeepEqual(expected, actual) {
t.Error(actual)
}
}
})
}
}