Skip to content

Bug 1897361: ctrcfg_test: Wait for our prior target config #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cgwalters wants to merge 2 commits into from
Closed

Bug 1897361: ctrcfg_test: Wait for our prior target config #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b818d76
ctrcfg_test: Wait for our prior target config
cgwalters Nov 13, 2020
52182ff
e2e: fix the poll loops to continue on error
rphillips Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions test/e2e/ctrcfg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func runTestWithCtrcfg(t *testing.T, testName, regexKey, expectedConfValue strin
err := cs.MachineConfigs().Delete(context.TODO(), oldMCConfig.Name, metav1.DeleteOptions{})
require.Nil(t, err, "machine config deletion failed")
})
waitForConfigAndPoolComplete(t, cs, poolName, oldMCConfig.Name)
lastTarget := waitForConfigAndPoolComplete(t, cs, poolName, oldMCConfig.Name)

// create our ctrcfg and attach it to our created node pool
cleanupCtrcfgFunc := createCtrcfgWithConfig(t, cs, ctrcfgName, poolName, cfg)
Expand All @@ -103,14 +103,10 @@ func runTestWithCtrcfg(t *testing.T, testName, regexKey, expectedConfValue strin
// cleanup ctrcfg and make sure it doesn't error
err = cleanupCtrcfgFunc()
require.Nil(t, err)

t.Logf("Deleted ContainerRuntimeConfig %s", ctrcfgName)
// there's a weird race where we observe the pool is updated when in reality
// that update is from before. Sleeping allows a new update cycle to start
time.Sleep(time.Second * 5)

// ensure config rolls back as expected
waitForConfigAndPoolComplete(t, cs, poolName, oldMCConfig.Name)
waitForPoolComplete(t, cs, poolName, lastTarget)

restoredConfValue := getValueFromCrioConfig(t, cs, node, regexKey, defaultPath)
require.Equal(t, restoredConfValue, oldConfValue, "ctrcfg deletion didn't cause node to roll back config")
Expand Down
12 changes: 8 additions & 4 deletions test/e2e/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ func getMcName(t *testing.T, cs *framework.ClientSet, poolName string) string {
return mcp.Status.Configuration.Name
}

// waitForConfigAndPoolComplete is a helper function that gets a renderedConfig and waits for its pool to complete
func waitForConfigAndPoolComplete(t *testing.T, cs *framework.ClientSet, pool, mcName string) {
// waitForConfigAndPoolComplete is a helper function that gets a renderedConfig and waits for its pool to complete.
// The return value is the final rendered config.
func waitForConfigAndPoolComplete(t *testing.T, cs *framework.ClientSet, pool, mcName string) string {
config, err := waitForRenderedConfig(t, cs, pool, mcName)
require.Nil(t, err, "failed to render machine config %s from pool %s", mcName, pool)
err = waitForPoolComplete(t, cs, pool, config)
require.Nil(t, err, "pool %s did not update to config %s", pool, config)
return config
}

// waitForRenderedConfig polls a MachineConfigPool until it has
Expand All @@ -49,7 +51,8 @@ func waitForRenderedConfig(t *testing.T, cs *framework.ClientSet, pool, mcName s
if err := wait.PollImmediate(2*time.Second, 5*time.Minute, func() (bool, error) {
mcp, err := cs.MachineConfigPools().Get(context.TODO(), pool, metav1.GetOptions{})
if err != nil {
return false, err
t.Logf("Error getting MachingConfigPool %v %v... retrying", pool, err)
return false, nil
}
for _, mc := range mcp.Spec.Configuration.Source {
if mc.Name == mcName {
Expand All @@ -71,7 +74,8 @@ func waitForPoolComplete(t *testing.T, cs *framework.ClientSet, pool, target str
if err := wait.Poll(2*time.Second, 20*time.Minute, func() (bool, error) {
mcp, err := cs.MachineConfigPools().Get(context.TODO(), pool, metav1.GetOptions{})
if err != nil {
return false, err
t.Logf("Error getting MachingConfigPool %v %v... retrying", pool, err)
return false, nil
}
if mcp.Status.Configuration.Name != target {
return false, nil
Expand Down