Merge pull request #316 from fmount/functional_tls

Remove errorReason from tls input check functional test
openstack-k8s-operators · Aug 12, 2024 · 05a3b0d · 05a3b0d
2 parents 84d9504 + e20dba2
commit 05a3b0d
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/test/functional/manila_controller_test.go b/test/functional/manila_controller_test.go
@@ -490,47 +490,39 @@ var _ = Describe("Manila controller", func() {
 		})
 
 		It("reports that the CA secret is missing", func() {
-			th.ExpectConditionWithDetails(
+			th.ExpectCondition(
 				manilaTest.ManilaAPI,
 				ConditionGetterFunc(ManilaAPIConditionGetter),
 				condition.TLSInputReadyCondition,
 				corev1.ConditionFalse,
-				condition.ErrorReason,
-				fmt.Sprintf("TLSInput error occured in TLS sources Secret %s/combined-ca-bundle not found", namespace),
 			)
 
-			th.ExpectConditionWithDetails(
+			th.ExpectCondition(
 				manilaTest.ManilaScheduler,
 				ConditionGetterFunc(ManilaSchedulerConditionGetter),
 				condition.TLSInputReadyCondition,
 				corev1.ConditionFalse,
-				condition.ErrorReason,
-				fmt.Sprintf("TLSInput error occured in TLS sources Secret %s/combined-ca-bundle not found", namespace),
 			)
 		})
 
 		It("reports that the internal cert secret is missing", func() {
 			DeferCleanup(k8sClient.Delete, ctx, th.CreateCABundleSecret(manilaTest.CABundleSecret))
-			th.ExpectConditionWithDetails(
+			th.ExpectCondition(
 				manilaTest.ManilaAPI,
 				ConditionGetterFunc(ManilaAPIConditionGetter),
 				condition.TLSInputReadyCondition,
 				corev1.ConditionFalse,
-				condition.ErrorReason,
-				fmt.Sprintf("TLSInput error occured in TLS sources Secret %s/internal-tls-certs not found", namespace),
 			)
 		})
 
 		It("reports that the public cert secret is missing", func() {
 			DeferCleanup(k8sClient.Delete, ctx, th.CreateCABundleSecret(manilaTest.CABundleSecret))
 			DeferCleanup(k8sClient.Delete, ctx, th.CreateCertSecret(manilaTest.InternalCertSecret))
-			th.ExpectConditionWithDetails(
+			th.ExpectCondition(
 				manilaTest.ManilaAPI,
 				ConditionGetterFunc(ManilaAPIConditionGetter),
 				condition.TLSInputReadyCondition,
 				corev1.ConditionFalse,
-				condition.ErrorReason,
-				fmt.Sprintf("TLSInput error occured in TLS sources Secret %s/public-tls-certs not found", namespace),
 			)
 		})