fix central reconciler unit tests

stackrox · Aug 1, 2023 · 14d6d5f · 14d6d5f
1 parent ee8b5ae
commit 14d6d5f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/fleetshard/pkg/central/reconciler/reconciler.go b/fleetshard/pkg/central/reconciler/reconciler.go
@@ -665,7 +665,7 @@ func (r *CentralReconciler) collectReconciliationStatus(ctx context.Context, rem
 		}
 	}
 
-	// Only store secrets if central was ready once to ensure we're not trying to get secrets before they are created
+	// Only report secrets if central is ready to ensure we're not trying to get secrets before they are created
 	if isRemoteCentralReady(remoteCentral) {
 		secrets, err := r.collectSecretsEncrypted(ctx, remoteCentral)
 		if err != nil {

diff --git a/fleetshard/pkg/central/reconciler/reconciler_test.go b/fleetshard/pkg/central/reconciler/reconciler_test.go
@@ -147,6 +147,24 @@ func centralDBInitFunc(_ context.Context, _ postgres.DBConnection, _, _ string)
 	return nil
 }
 
+func centralTLSSecretObject() *v1.Secret {
+	return &v1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "central-tls",
+			Namespace: centralNamespace,
+		},
+	}
+}
+
+func centralDBPasswordSecretObject() *v1.Secret {
+	return &v1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "central-db-password",
+			Namespace: centralNamespace,
+		},
+	}
+}
+
 func conditionForType(conditions []private.DataPlaneClusterUpdateStatusRequestConditions, conditionType string) (*private.DataPlaneClusterUpdateStatusRequestConditions, bool) {
 	for _, c := range conditions {
 		if c.Type == conditionType {
@@ -367,6 +385,8 @@ func TestReconcileLastHashSetOnSuccess(t *testing.T) {
 			},
 		},
 		centralDeploymentObject(),
+		centralTLSSecretObject(),
+		centralDBPasswordSecretObject(),
 	)
 
 	managedCentral := simpleManagedCentral
@@ -434,18 +454,8 @@ func TestIgnoreCacheForCentralForceReconcileAlways(t *testing.T) {
 			},
 		},
 		centralDeploymentObject(),
-		&v1.Secret{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "central-tls",
-				Namespace: centralNamespace,
-			},
-		},
-		&v1.Secret{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "central-db-password",
-				Namespace: centralNamespace,
-			},
-		},
+		centralTLSSecretObject(),
+		centralDBPasswordSecretObject(),
 	)
 
 	managedCentral := simpleManagedCentral