Merge pull request #440 from Vincent056/rotate_cert

Fix TestFileIntegrityCertRotation e2e test
openshift · Sep 27, 2023 · 467e23a · 467e23a
2 parents 97981b4 + 922ebf5
commit 467e23a
Show file tree

Hide file tree

Showing 2 changed files with 325 additions and 46 deletions.
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -982,17 +982,14 @@ func TestFileIntegrityCertRotation(t *testing.T) {
 	t.Log("Asserting that the FileIntegrity check is in a SUCCESS state after deploying it")
 	assertNodesConditionIsSuccess(t, f, testName, namespace, 2*time.Second, 5*time.Minute, nodeWorkerRoleLabelKey)
 
-	t.Log("Rotating kube-apiserver-to-kubelet-client-ca certificate")
-	rotateKubeAPIServerToKubeletClientCA(t, f, 2*time.Second, 10*time.Minute)
-
-	t.Log("Waiting for Nodes to start updating")
-	assertNodesUpdatingStarted(t, f, 2*time.Second, 10*time.Minute)
+	t.Log("Rotating cluster certificate")
+	assertClusterCertRotation(t, f, 2*time.Second, 15*time.Minute)
 
 	// Wait for nodes to be ready
 	if err = waitForNodesToBeReady(t, f); err != nil {
 		t.Errorf("Timeout waiting for nodes")
 	}
-	t.Log("Asserting that the FileIntegrity is in a SUCCESS state after rotating kube-apiserver-to-kubelet-client-ca certificate")
+	t.Log("Asserting that the FileIntegrity is in a SUCCESS state after rotating cluster certificate")
 	assertNodesConditionIsSuccess(t, f, testName, namespace, 2*time.Second, 5*time.Minute, nodeWorkerRoleLabelKey)
 
 }