github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122011 from carlory/fix-121752

Browse Source 
fix falky test pkg/registry/core/persistentvolume/storage TestUpdateStatus
This commit is contained in:
Kubernetes Prow Robot 2023-12-18 06:21:00 +01:00 committed by GitHub
commit 138ac71fb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/registry/core/persistentvolume/storage/storage_test.go
View File

@ -17,12 +17,10 @@ limitations under the License.
package storage
import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kubernetes/pkg/features"
"testing"
"context"
"testing"
"time"
"github.com/google/go-cmp/cmp"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/resource"
@ -35,7 +33,10 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/registry/core/persistentvolume"
"k8s.io/kubernetes/pkg/registry/registrytest"
)
@ -190,13 +191,16 @@ func TestUpdateStatus(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
// We need to set custom timestamp which is not the same as the one on existing PV
// - doing so will prevent timestamp update on phase change and custom one is used instead.
pvStartTimestamp = &metav1.Time{Time: pvStartTimestamp.Time.Add(time.Second)}
pvIn := &api.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
Status: api.PersistentVolumeStatus{
Phase: api.VolumeBound,
// Set the same timestamp as original PV so this won't get updated on phase change breaking DeepEqual() later in test.
Phase: api.VolumeBound,
LastPhaseTransitionTime: pvStartTimestamp,
},
}