Merge pull request #120 from tpantelis/use_new_cond_type_defs

Use new ServiceExport Condition definitions in conformance tests

Author: k8s-ci-robot

conformance/conformance_suite.go

@@ -288,12 +288,13 @@ func (t *testDriver) ensureNoServiceImport(c *clusterClients, name, nonConforman
 	}, 5*time.Second, 100*time.Millisecond).Should(BeTrue(), reportNonConformant(nonConformanceMsg))
 }
 
-func (t *testDriver) awaitServiceExportCondition(c *clusterClients, condType string, wantStatus metav1.ConditionStatus) {
+func (t *testDriver) awaitServiceExportCondition(c *clusterClients, condType v1alpha1.ServiceExportConditionType,
+	wantStatus metav1.ConditionStatus) {
 	Eventually(func() bool {
 		se, err := c.mcs.MulticlusterV1alpha1().ServiceExports(t.namespace).Get(ctx, helloServiceName, metav1.GetOptions{})
 		Expect(err).ToNot(HaveOccurred())
 
-		cond := meta.FindStatusCondition(se.Status.Conditions, condType)
+		cond := meta.FindStatusCondition(se.Status.Conditions, string(condType))
 		return cond != nil && cond.Status == wantStatus
 	}, 20*time.Second, 100*time.Millisecond).Should(BeTrue(),
 		reportNonConformant(fmt.Sprintf("The %s condition was not set to %s", condType, wantStatus)))

conformance/go.mod

@@ -9,7 +9,7 @@ require (
 	k8s.io/apimachinery v0.32.5
 	k8s.io/client-go v0.32.5
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
-	sigs.k8s.io/mcs-api v0.1.0
+	sigs.k8s.io/mcs-api v0.2.1-0.20250806212941-7dbcbd12a231
 )
 
 replace sigs.k8s.io/mcs-api => ..

conformance/service_import.go

@@ -131,8 +131,8 @@ func testGeneralServiceImport() {
 				Label(OptionalLabel), Label(ExportedLabelsLabel), func() {
 					AddReportEntry(SpecRefReportEntry, "https://github.com/kubernetes/enhancements/tree/master/keps/sig-multicluster/1645-multi-cluster-services-api#labels-and-annotations")
 
-					t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
-					t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
+					t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
+					t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
 
 					t.awaitServiceImport(&clients[0], t.helloService.Name, false,
 						func(g Gomega, serviceImport *v1alpha1.ServiceImport) {
@@ -163,6 +163,8 @@ func testClusterIPServiceImport() {
 		"Unexporting should delete the ServiceImport", Label(RequiredLabel), func() {
 		AddReportEntry(SpecRefReportEntry, "https://github.com/kubernetes/enhancements/tree/master/keps/sig-multicluster/1645-multi-cluster-services-api#importing-services")
 
+		t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConditionValid, metav1.ConditionTrue)
+
 		for i := range clients {
 			serviceImport := t.awaitServiceImport(&clients[i], helloServiceName, true, nil)
 
@@ -245,8 +247,8 @@ func testClusterIPServiceImport() {
 			Specify("should apply the conflict resolution policy and report a Conflict condition on each ServiceExport", func() {
 				AddReportEntry(SpecRefReportEntry, "https://github.com/kubernetes/enhancements/tree/master/keps/sig-multicluster/1645-multi-cluster-services-api#service-port")
 
-				t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
-				t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
+				t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
+				t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
 
 				t.awaitServiceImport(&clients[0], t.helloService.Name, false,
 					func(g Gomega, serviceImport *v1alpha1.ServiceImport) {
@@ -314,7 +316,7 @@ func testExternalNameService() {
 	Specify("Exporting an ExternalName service should set ServiceExport Valid condition to False", Label(RequiredLabel), func() {
 		AddReportEntry(SpecRefReportEntry, "https://github.com/kubernetes/enhancements/blob/master/keps/sig-multicluster/1645-multi-cluster-services-api/README.md#service-types")
 
-		t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportValid, metav1.ConditionFalse)
+		t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConditionValid, metav1.ConditionFalse)
 		t.ensureNoServiceImport(&clients[0], helloServiceName,
 			"the ServiceImport should not exist for an ExternalName service")
 	})
@@ -335,7 +337,7 @@ func testServiceTypeConflict() {
 		"report a Conflict condition on the ServiceExport", Label(RequiredLabel), func() {
 		AddReportEntry(SpecRefReportEntry, "https://github.com/kubernetes/enhancements/tree/master/keps/sig-multicluster/1645-multi-cluster-services-api#headlessness")
 
-		t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
-		t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
+		t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
+		t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConditionConflict, metav1.ConditionTrue)
 	})
 }