Fix secrets-encrypt reencrypt timeout error (k3s-io#11440)

* Add missing default OS for split server test * Launch go routine and return for k3s secrets-encrypt reencrypt --------- Signed-off-by: Derek Nola <[email protected]>
dereknola · Dec 9, 2024 · 07d60c0 · 07d60c0
1 parent 666b590
commit 07d60c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/server/secrets-encrypt.go b/pkg/server/secrets-encrypt.go
@@ -282,7 +282,10 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool
 		return err
 	}
 
-	return reencryptAndRemoveKey(ctx, server, skip, nodeName)
+	// We use a timeout of 10s for the reencrypt call, so finish the process as a go routine and return immediately.
+	// No errors are returned to the user via CLI, any errors will be logged on the server
+	go reencryptAndRemoveKey(ctx, server, skip, nodeName)
+	return nil
 }
 
 func addAndRotateKeys(server *config.Control) error {

diff --git a/tests/e2e/splitserver/Vagrantfile b/tests/e2e/splitserver/Vagrantfile
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
 NODE_ROLES = (ENV['E2E_NODE_ROLES'] ||
   ["server-etcd-0", "server-etcd-1", "server-etcd-2", "server-cp-0", "server-cp-1", "agent-0", "agent-1"])
 NODE_BOXES = (ENV['E2E_NODE_BOXES'] ||
-  ['bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04'])
+  ['bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04', 'bento/ubuntu-24.04'])
 GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master")
 RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "")
 GOCOVER = (ENV['E2E_GOCOVER'] || "")