From b6f1b1384c56f509e78ce1751ff4e1297dbaf028 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Mon, 10 Jul 2023 14:18:36 -0700 Subject: [PATCH 1/2] Don't use zgrep if apparmor is enforced for it Signed-off-by: Derek Nola --- contrib/util/check-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/util/check-config.sh b/contrib/util/check-config.sh index 24f3e3585b78..16d743720a41 100755 --- a/contrib/util/check-config.sh +++ b/contrib/util/check-config.sh @@ -25,7 +25,7 @@ if [ $# -gt 0 ]; then CONFIG="$1" fi -if ! command -v zgrep >/dev/null 2>&1; then +if ! command -v zgrep >/dev/null 2>&1 || eval "cat /sys/kernel/security/apparmor/profiles | grep -q 'zgrep (enforce)'"; then zgrep() { zcat "$2" | grep "$1" } From 69115bea42ed3c3ceabba8b72c3b54ec079e16da Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 11 Jul 2023 11:00:14 -0700 Subject: [PATCH 2/2] Bump e2e se timeouts for reencryption time Signed-off-by: Derek Nola --- tests/e2e/secretsencryption/secretsencryption_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/secretsencryption/secretsencryption_test.go b/tests/e2e/secretsencryption/secretsencryption_test.go index 9fcac919cb43..bee68ac9405d 100644 --- a/tests/e2e/secretsencryption/secretsencryption_test.go +++ b/tests/e2e/secretsencryption/secretsencryption_test.go @@ -196,7 +196,7 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() { cmd = "k3s secrets-encrypt status" Eventually(func() (string, error) { return e2e.RunCmdOnNode(cmd, serverNodeNames[0]) - }, "180s", "5s").Should(ContainSubstring("Current Rotation Stage: reencrypt_finished")) + }, "240s", "10s").Should(ContainSubstring("Current Rotation Stage: reencrypt_finished")) for _, nodeName := range serverNodeNames[1:] { res, err := e2e.RunCmdOnNode(cmd, nodeName) @@ -219,7 +219,7 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() { g.Expect(res).Should(ContainSubstring("Encryption Status: Enabled")) g.Expect(res).Should(ContainSubstring("Current Rotation Stage: reencrypt_finished")) g.Expect(res).Should(ContainSubstring("Server Encryption Hashes: All hashes match")) - }, "420s", "2s").Should(Succeed()) + }, "420s", "5s").Should(Succeed()) } }) }) @@ -237,7 +237,7 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() { cmd = "k3s secrets-encrypt status" Eventually(func() (string, error) { return e2e.RunCmdOnNode(cmd, serverNodeNames[0]) - }, "180s", "5s").Should(ContainSubstring("Current Rotation Stage: reencrypt_finished")) + }, "240s", "10s").Should(ContainSubstring("Current Rotation Stage: reencrypt_finished")) for i, nodeName := range serverNodeNames { Eventually(func(g Gomega) {