Wait for ownerReferences to appear on the resources (#627)

* wait for ownerReferences to appear on the resources

* don't retry poll call if there wasn't any error

Author: linki

cmd/e2e/configuration_resources_test.go

@@ -53,19 +53,21 @@ func (suite *ConfigurationResourcesTestSuite) TestReferencedConfigMaps() {
 	stack, err := waitForStack(suite.T(), suite.stacksetName, suite.stackVersion)
 	suite.Require().NoError(err)
 
-	// Fetch the latest version of the ConfigMap
-	configMap, err := waitForConfigMap(suite.T(), configMapName)
+	// Ensure that the ConfigMap exists in the cluster
+	_, err = waitForConfigMap(suite.T(), configMapName)
 	suite.Require().NoError(err)
 
 	// Ensure that the ConfigMap is owned by the Stack
-	suite.Equal([]metav1.OwnerReference{
+	ownerReferences := []metav1.OwnerReference{
 		{
 			APIVersion: core.APIVersion,
 			Kind:       core.KindStack,
 			Name:       stack.Name,
 			UID:        stack.UID,
 		},
-	}, configMap.OwnerReferences)
+	}
+	err = waitForConfigMapOwnerReferences(suite.T(), configMapName, ownerReferences).await()
+	suite.Require().NoError(err)
 }
 
 // TestReferencedSecrets tests that Secrets referenced in the StackSet spec are owned by the Stack.
@@ -88,19 +90,21 @@ func (suite *ConfigurationResourcesTestSuite) TestReferencedSecrets() {
 	stack, err := waitForStack(suite.T(), suite.stacksetName, suite.stackVersion)
 	suite.Require().NoError(err)
 
-	// Fetch the latest version of the Secret
-	secret, err := waitForSecret(suite.T(), secretName)
+	// Ensure that the Secret exists in the cluster
+	_, err = waitForSecret(suite.T(), secretName)
 	suite.Require().NoError(err)
 
 	// Ensure that the Secret is owned by the Stack
-	suite.Equal([]metav1.OwnerReference{
+	ownerReferences := []metav1.OwnerReference{
 		{
 			APIVersion: core.APIVersion,
 			Kind:       core.KindStack,
 			Name:       stack.Name,
 			UID:        stack.UID,
 		},
-	}, secret.OwnerReferences)
+	}
+	err = waitForSecretOwnerReferences(suite.T(), secretName, ownerReferences).await()
+	suite.Require().NoError(err)
 }
 
 // TestGeneratedPCS tests that PlatformCredentialsSets defined in the StackSet are

cmd/e2e/test_utils.go

@@ -486,6 +486,19 @@ func waitForConfigMap(t *testing.T, configMapName string) (*corev1.ConfigMap, er
 	return configMapInterface().Get(context.Background(), configMapName, metav1.GetOptions{})
 }
 
+func waitForConfigMapOwnerReferences(t *testing.T, configMapName string, expectedOwnerReferences []metav1.OwnerReference) *awaiter {
+	return newAwaiter(t, fmt.Sprintf("configmap %s to reach desired ownerReferences", configMapName)).withPoll(func() (retry bool, err error) {
+		configMap, err := configMapInterface().Get(context.Background(), configMapName, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+		if !reflect.DeepEqual(expectedOwnerReferences, configMap.OwnerReferences) {
+			return true, fmt.Errorf("%s: actual ownerReferences: %+v, expected: %+v, diff:\n%v", configMapName, configMap.OwnerReferences, expectedOwnerReferences, cmp.Diff(configMap.OwnerReferences, expectedOwnerReferences))
+		}
+		return false, nil
+	})
+}
+
 func waitForSecret(t *testing.T, secretName string) (*corev1.Secret, error) {
 	err := resourceCreated(t, "secret", secretName, secretInterface()).await()
 	if err != nil {
@@ -494,6 +507,19 @@ func waitForSecret(t *testing.T, secretName string) (*corev1.Secret, error) {
 	return secretInterface().Get(context.Background(), secretName, metav1.GetOptions{})
 }
 
+func waitForSecretOwnerReferences(t *testing.T, secretName string, expectedOwnerReferences []metav1.OwnerReference) *awaiter {
+	return newAwaiter(t, fmt.Sprintf("secret %s to reach desired ownerReferences", secretName)).withPoll(func() (retry bool, err error) {
+		secret, err := secretInterface().Get(context.Background(), secretName, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+		if !reflect.DeepEqual(expectedOwnerReferences, secret.OwnerReferences) {
+			return true, fmt.Errorf("%s: actual ownerReferences: %+v, expected: %+v, diff:\n%v", secretName, secret.OwnerReferences, expectedOwnerReferences, cmp.Diff(secret.OwnerReferences, expectedOwnerReferences))
+		}
+		return false, nil
+	})
+}
+
 func waitForPlatformCredentialsSet(t *testing.T, pcsName string) (*zv1.PlatformCredentialsSet, error) {
 	err := resourceCreated(t, "platformCredentialsSet", pcsName, platformCredentialsSetInterface()).await()
 	if err != nil {