djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/integration: make TestKubeCertAgent more stable

Browse Source 
I think the reason we were seeing flakes here is because the kube cert agent
pods had not reached a steady state even though our test assertions passed, so
the test would proceed immediately and run more assertions on top of a weird
state of the kube cert agent pods.

Signed-off-by: Andrew Keesler <akeesler@vmware.com>
This commit is contained in:
Andrew Keesler 2021-02-10 11:25:08 -05:00
parent 5b076e7421
commit 12d5b8959d
No known key found for this signature in database
GPG Key ID: 27CE0444346F9413
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/concierge_kubecertagent_test.go
View File

@ -16,6 +16,7 @@ import (
"k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/wait"
"go.pinniped.dev/test/library" "go.pinniped.dev/test/library"
) )
@ -90,6 +91,9 @@ func TestKubeCertAgent(t *testing.T) {
} }
t.Run("reconcile on update", func(t *testing.T) { t.Run("reconcile on update", func(t *testing.T) {
// Ensure that the next test will start from a known state.
defer ensureKubeCertAgentSteadyState(t, agentPodsReconciled)
// Update the image of the first pod. The controller should see it, and flip it back. // Update the image of the first pod. The controller should see it, and flip it back.
// //
// Note that we update the toleration field here because it is the only field, currently, that // Note that we update the toleration field here because it is the only field, currently, that
@ -109,6 +113,9 @@ func TestKubeCertAgent(t *testing.T) {
}) })
t.Run("reconcile on delete", func(t *testing.T) { t.Run("reconcile on delete", func(t *testing.T) {
// Ensure that the next test will start from a known state.
defer ensureKubeCertAgentSteadyState(t, agentPodsReconciled)
// Delete the first pod. The controller should see it, and flip it back. // Delete the first pod. The controller should see it, and flip it back.
err = kubeClient. err = kubeClient.
CoreV1(). CoreV1().
@ -122,6 +129,21 @@ func TestKubeCertAgent(t *testing.T) {
}) })
} }
func ensureKubeCertAgentSteadyState(t *testing.T, agentPodsReconciled func() bool) {
t.Helper()
const wantSteadyStateSnapshots = 3
var steadyStateSnapshots int
require.NoError(t, wait.Poll(250*time.Millisecond, 30*time.Second, func() (bool, error) {
if agentPodsReconciled() {
steadyStateSnapshots++
} else {
steadyStateSnapshots = 0
}
return steadyStateSnapshots == wantSteadyStateSnapshots, nil
}))
}
func sortPods(pods *corev1.PodList) { func sortPods(pods *corev1.PodList) {
sort.Slice(pods.Items, func(i, j int) bool { sort.Slice(pods.Items, func(i, j int) bool {
return pods.Items[i].Name < pods.Items[j].Name return pods.Items[i].Name < pods.Items[j].Name