github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Pass DeleteOptions down to the Reactor

Browse Source 
Co-authored-by: Mo Khan <theenjeru@gmail.com>
This commit is contained in:
Chun Chen
2021-06-17 18:06:47 +08:00
parent afff019fbc
commit 621970476f
5 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/bootstrap/common_test.go
View File

@@ -23,6 +23,7 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
core "k8s.io/client-go/testing"
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
"k8s.io/kubernetes/pkg/apis/core/helper"
@@ -34,6 +35,7 @@ func newTokenSecret(tokenID, tokenSecret string) *v1.Secret {
Namespace: metav1.NamespaceSystem,
Name: bootstrapapi.BootstrapTokenSecretPrefix + tokenID,
ResourceVersion: "1",
UID: types.UID("uid" + tokenID),
},
Type: bootstrapapi.SecretTypeBootstrapToken,
Data: map[string][]byte{

15
pkg/controller/bootstrap/tokencleaner_test.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/davecgh/go-spew/spew"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
@@ -76,10 +77,13 @@ func TestCleanerExpired(t *testing.T) {
cleaner.evalSecret(secret)
expected := []core.Action{
core.NewDeleteAction(
core.NewDeleteActionWithOptions(
schema.GroupVersionResource{Version: "v1", Resource: "secrets"},
api.NamespaceSystem,
secret.ObjectMeta.Name),
secret.ObjectMeta.Name,
metav1.DeleteOptions{
Preconditions: metav1.NewUIDPreconditions(string(secret.UID)),
}),
}
verifyActions(t, expected, cl.Actions())
@@ -138,10 +142,13 @@ func TestCleanerExpiredAt(t *testing.T) {
// secret was eventually deleted
expected = []core.Action{
core.NewDeleteAction(
core.NewDeleteActionWithOptions(
schema.GroupVersionResource{Version: "v1", Resource: "secrets"},
api.NamespaceSystem,
secret.ObjectMeta.Name),
secret.ObjectMeta.Name,
metav1.DeleteOptions{
Preconditions: metav1.NewUIDPreconditions(string(secret.UID)),
}),
}
verifyFunc()
}

15
pkg/controller/serviceaccount/tokens_controller_test.go
View File

@@ -409,7 +409,10 @@ func TestTokenCreation(t *testing.T) {
DeletedServiceAccount: serviceAccount(tokenSecretReferences()),
ExpectedActions: []core.Action{
core.NewDeleteAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, "token-secret-1"),
core.NewDeleteActionWithOptions(
schema.GroupVersionResource{Version: "v1", Resource: "secrets"},
metav1.NamespaceDefault, "token-secret-1",
*metav1.NewPreconditionDeleteOptions("23456")),
},
},
@@ -419,7 +422,10 @@ func TestTokenCreation(t *testing.T) {
AddedSecret: serviceAccountTokenSecret(),
ExpectedActions: []core.Action{
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
core.NewDeleteAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, "token-secret-1"),
core.NewDeleteActionWithOptions(
schema.GroupVersionResource{Version: "v1", Resource: "secrets"},
metav1.NamespaceDefault, "token-secret-1",
*metav1.NewPreconditionDeleteOptions("23456")),
},
},
"added secret with serviceaccount": {
@@ -484,7 +490,10 @@ func TestTokenCreation(t *testing.T) {
UpdatedSecret: serviceAccountTokenSecret(),
ExpectedActions: []core.Action{
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
core.NewDeleteAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, metav1.NamespaceDefault, "token-secret-1"),
core.NewDeleteActionWithOptions(
schema.GroupVersionResource{Version: "v1", Resource: "secrets"},
metav1.NamespaceDefault, "token-secret-1",
*metav1.NewPreconditionDeleteOptions("23456")),
},
},
"updated secret with serviceaccount": {