Skip to content

K
k3s
Unverified Commit ea1856f1 authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files
Options

Fix secrets-encrypt reencrypt timeout error (#11442)

* Add missing default OS for split server test * Launch go routine and return for k3s secrets-encrypt reencrypt --------- Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com>
parent 6e6af988
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pkg/server/secrets-encrypt.go
View file @ ea1856f1
...@@ -282,7 +282,10 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool ...@@ -282,7 +282,10 @@ func encryptionReencrypt(ctx context.Context, server *config.Control, force bool
return err 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 { func addAndRotateKeys(server *config.Control) error {
......
tests/e2e/splitserver/Vagrantfile
View file @ ea1856f1
...@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' ...@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES = (ENV['E2E_NODE_ROLES'] || 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"]) ["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'] || 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") GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master")
RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "")
GOCOVER = (ENV['E2E_GOCOVER'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment