mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2026-05-04 20:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: fix the flakes in tests with trusted roots

Browse Source 
As one of the integration tests was overriding TrustedRoots config, it
erased the required settings leading to a random failure (depending on
the nodes picked for subsequent tests).

Fixes #13013

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
(cherry picked from commit 70cefab6af3dacdc80921b55ca8dbf5644501c6c)
This commit is contained in:
Andrey Smirnov 2026-03-24 21:08:20 +04:00
parent 7fa16b4978
commit efc76f0bfe
No known key found for this signature in database
GPG Key ID: 322C6F63F594CE7C
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/integration/api/trusted-roots.go
View File

@ -12,8 +12,11 @@ import (
"strings"
"time"
"github.com/siderolabs/gen/xslices"
"github.com/siderolabs/talos/internal/integration/base"
"github.com/siderolabs/talos/pkg/machinery/client"
"github.com/siderolabs/talos/pkg/machinery/config/config"
"github.com/siderolabs/talos/pkg/machinery/config/types/security"
"github.com/siderolabs/talos/pkg/machinery/constants"
)
@ -65,6 +68,14 @@ func (suite *TrustedRootsSuite) TestTrustedRoots() {
// build a Talos API context which is tied to the node
nodeCtx := client.WithNode(suite.ctx, node)
// query the current TrustedRoots config to restore it after the test
cfg, err := suite.ReadConfigFromNode(nodeCtx)
suite.Require().NoError(err)
originalConfig := xslices.Filter(cfg.Documents(), func(doc config.Document) bool {
return doc.Kind() == security.TrustedRootsConfig
})
const name = "test-ca"
cfgDocument := security.NewTrustedRootsConfigV1Alpha1()
@ -90,6 +101,11 @@ func (suite *TrustedRootsSuite) TestTrustedRoots() {
suite.Require().Eventually(func() bool {
return !strings.Contains(suite.readTrustedRoots(nodeCtx), name)
}, 5*time.Second, 100*time.Millisecond)
// restore back trusted roots config if it existed before the test
if len(originalConfig) > 0 {
suite.PatchMachineConfig(nodeCtx, xslices.Map(originalConfig, func(d config.Document) any { return d })...)
}
}
func init() {