From f0caf905efd93702b27cc38a2b84c67a3d742dc3 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 7 Oct 2022 12:41:30 -0700 Subject: [PATCH] Remove rotate retries Signed-off-by: Derek Nola --- .../secretsencryption/secretsencryption_int_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/integration/secretsencryption/secretsencryption_int_test.go b/tests/integration/secretsencryption/secretsencryption_int_test.go index b654de92165b..9532cf207c34 100644 --- a/tests/integration/secretsencryption/secretsencryption_int_test.go +++ b/tests/integration/secretsencryption/secretsencryption_int_test.go @@ -68,12 +68,13 @@ var _ = Describe("secrets encryption rotation", Ordered, func() { Eventually(func() error { return testutil.K3sDefaultDeployments() }, "180s", "5s").Should(Succeed()) + Eventually(func() (string, error) { + return testutil.K3sCmd("secrets-encrypt status -d", secretsEncryptionDataDir) + }, "30s", "5s").Should(ContainSubstring("Current Rotation Stage: prepare")) }) It("rotates the keys", func() { - Eventually(func() (string, error) { - return testutil.K3sCmd("secrets-encrypt rotate -d", secretsEncryptionDataDir) - }, "10s", "2s").Should(ContainSubstring("rotate completed successfully")) - + Expect(testutil.K3sCmd("secrets-encrypt rotate -d", secretsEncryptionDataDir)). + To(ContainSubstring("rotate completed successfully")) result, err := testutil.K3sCmd("secrets-encrypt status -d", secretsEncryptionDataDir) Expect(err).NotTo(HaveOccurred()) Expect(result).To(ContainSubstring("Current Rotation Stage: rotate"))