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

Make cleanup aware of uid differences

Browse Source
This commit is contained in:
Jordan Liggitt
2026-04-02 11:13:44 -04:00
parent eb8032bb83
commit 1140c34121
1 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/integration/apiserver/discovery/framework.go
View File

@@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/dynamic"
@@ -141,6 +142,13 @@ func (a applyAPIService) Do(ctx context.Context, client testClient) error {
func (a applyAPIService) Cleanup(ctx context.Context, client testClient) error {
name := a.Version + "." + a.Group
// Capture the UID of the existing object (if it exists)
var uid types.UID
if obj, err := client.ApiregistrationV1().APIServices().Get(ctx, name, metav1.GetOptions{}); err == nil {
uid = obj.UID
}
err := client.ApiregistrationV1().APIServices().Delete(ctx, name, metav1.DeleteOptions{})
if err != nil && !errors.IsNotFound(err) {
@@ -153,15 +161,21 @@ func (a applyAPIService) Cleanup(ctx context.Context, client testClient) error {
maxTimeout,
true,
func(ctx context.Context) (done bool, err error) {
_, err = client.ApiregistrationV1().APIServices().Get(ctx, name, metav1.GetOptions{})
if err == nil {
obj, err := client.ApiregistrationV1().APIServices().Get(ctx, name, metav1.GetOptions{})
switch {
case errors.IsNotFound(err):
// object is gone
return true, nil
case err == nil && obj.UID != uid:
// the instance we were waiting for is gone
return true, nil
case err != nil:
// some other error occurred
return false, err
default:
// the instance we were waiting for is still around
return false, nil
}
if !errors.IsNotFound(err) {
return false, err
}
return true, nil
},
)
@@ -210,6 +224,13 @@ func (a applyCRD) Do(ctx context.Context, client testClient) error {
func (a applyCRD) Cleanup(ctx context.Context, client testClient) error {
name := a.Names.Plural + "." + a.Group
// Capture the UID of the existing object (if it exists)
var uid types.UID
if obj, err := client.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{}); err == nil {
uid = obj.UID
}
err := client.ApiextensionsV1().CustomResourceDefinitions().Delete(ctx, name, metav1.DeleteOptions{})
if err != nil && !errors.IsNotFound(err) {
@@ -222,15 +243,21 @@ func (a applyCRD) Cleanup(ctx context.Context, client testClient) error {
maxTimeout,
true,
func(ctx context.Context) (done bool, err error) {
_, err = client.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{})
if err == nil {
obj, err := client.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{})
switch {
case errors.IsNotFound(err):
// object is gone
return true, nil
case err == nil && obj.UID != uid:
// the instance we were waiting for is gone
return true, nil
case err != nil:
// some other error occurred
return false, err
default:
// the instance we were waiting for is still around
return false, nil
}
if !errors.IsNotFound(err) {
return false, err
}
return true, nil
},
)