Skip to content

NO-JIRA: fix lock failure cases #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gangwgr wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −5
Open

NO-JIRA: fix lock failure cases #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions test/e2e/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,25 +141,29 @@ var _ = g.Describe("kube-controller-manager-operator", func() {
g.Context("TestKCMLeaseRecovery", func() {
tests := []struct {
name string
namespace string
leaseName string
}{
{
name: "kube-controller-manager",
namespace: "kube-system",
leaseName: "kube-controller-manager",
},
{
name: "cert-recovery-controller-lock",
namespace: operatorclient.TargetNamespace,
leaseName: "cert-recovery-controller-lock",
},
{
name: "cluster-policy-controller-lock",
namespace: operatorclient.TargetNamespace,
leaseName: "cluster-policy-controller-lock",
},
}
for _, test := range tests {
test := test
g.It(test.name, func() {
testKCMLeaseRecovery(g.GinkgoTB(), test.leaseName)
testKCMLeaseRecovery(g.GinkgoTB(), test.namespace, test.leaseName)
})
}
})
Expand Down Expand Up @@ -334,7 +338,7 @@ func testConfigMapDeletion(kubeClient *kubernetes.Clientset, namespace, config s
return err
}

func testKCMLeaseRecovery(t testing.TB, leaseName string) {
func testKCMLeaseRecovery(t testing.TB, namespace, leaseName string) {
kubeConfig, err := testlib.NewClientConfigForTest()
if err != nil {
t.Fatal(err)
Expand All @@ -346,15 +350,15 @@ func testKCMLeaseRecovery(t testing.TB, leaseName string) {

ctx := context.Background()

// Try to delete the lease object in kube-system
err = kubeClient.CoordinationV1().Leases("kube-system").Delete(ctx, leaseName, metav1.DeleteOptions{})
// Try to delete the lease object
err = kubeClient.CoordinationV1().Leases(namespace).Delete(ctx, leaseName, metav1.DeleteOptions{})
if err != nil {
t.Fatal(err)
}

// Check to see that the lease object then gets recreated
err = wait.Poll(time.Second*5, time.Second*300, func() (bool, error) {
_, err := kubeClient.CoordinationV1().Leases("kube-system").Get(ctx, leaseName, metav1.GetOptions{})
_, err := kubeClient.CoordinationV1().Leases(namespace).Get(ctx, leaseName, metav1.GetOptions{})
if machineryerrors.IsNotFound(err) {
return false, nil
}
Expand Down