Merge pull request #108 from zhiying-lin/add-conformance-test

test: add conformance test for the externalName type service

Author: k8s-ci-robot

conformance/conformance_suite.go

@@ -267,14 +267,22 @@ func (t *testDriver) ensureServiceImport(c *clusterClients, name, nonConformance
 	}, 5*time.Second, 100*time.Millisecond).ShouldNot(HaveOccurred(), reportNonConformant(nonConformanceMsg))
 }
 
-func (t *testDriver) awaitServiceExportCondition(c *clusterClients, condType string) {
+func (t *testDriver) ensureNoServiceImport(c *clusterClients, name, nonConformanceMsg string) {
+	Consistently(func() bool {
+		_, err := c.mcs.MulticlusterV1alpha1().ServiceImports(t.namespace).Get(ctx, name, metav1.GetOptions{})
+		return apierrors.IsNotFound(err)
+	}, 5*time.Second, 100*time.Millisecond).Should(BeTrue(), reportNonConformant(nonConformanceMsg))
+}
+
+func (t *testDriver) awaitServiceExportCondition(c *clusterClients, condType string, wantStatus metav1.ConditionStatus) {
 	Eventually(func() bool {
 		se, err := c.mcs.MulticlusterV1alpha1().ServiceExports(t.namespace).Get(ctx, helloServiceName, metav1.GetOptions{})
 		Expect(err).ToNot(HaveOccurred())
 
-		return meta.FindStatusCondition(se.Status.Conditions, condType) != nil
+		cond := meta.FindStatusCondition(se.Status.Conditions, condType)
+		return cond != nil && cond.Status == wantStatus
 	}, 20*time.Second, 100*time.Millisecond).Should(BeTrue(),
-		reportNonConformant(fmt.Sprintf("The %s condition was not set", condType)))
+		reportNonConformant(fmt.Sprintf("The %s condition was not set to %s", condType, wantStatus)))
 }
 
 func (t *testDriver) startRequestPod(ctx context.Context, client clusterClients) {

conformance/report.go

@@ -40,6 +40,7 @@ const (
 	ConnectivityLabel        = "Connectivity"
 	ClusterIPLabel           = "ClusterIP"
 	HeadlessLabel            = "Headless"
+	ExternalNameLabel        = "ExternalName"
 	EndpointSliceLabel       = "EndpointSlice"
 	ExportedLabelsLabel      = "ExportedLabels"
 	SpecRefReportEntry       = "spec-ref"

conformance/service_import.go

@@ -24,13 +24,15 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
 )
 
 var (
 	_ = Describe("", testGeneralServiceImport)
 	_ = Describe("", Label(ClusterIPLabel), testClusterIPServiceImport)
 	_ = Describe("", Label(HeadlessLabel), testHeadlessServiceImport)
+	_ = Describe("", Label(ExternalNameLabel), testExternalNameService)
 )
 
 func testGeneralServiceImport() {
@@ -136,8 +138,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)
-					t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict)
+					t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
+					t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
 
 					serviceImport := t.awaitServiceImport(&clients[0], t.helloService.Name, func(serviceImport *v1alpha1.ServiceImport) bool {
 						return len(serviceImport.Labels) > 0
@@ -263,8 +265,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)
-				t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict)
+				t.awaitServiceExportCondition(&clients[0], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
+				t.awaitServiceExportCondition(&clients[1], v1alpha1.ServiceExportConflict, metav1.ConditionTrue)
 
 				serviceImport := t.awaitServiceImport(&clients[0], t.helloService.Name, func(serviceImport *v1alpha1.ServiceImport) bool {
 					return len(serviceImport.Spec.Ports) == len(t.helloService.Spec.Ports)
@@ -323,3 +325,24 @@ func testHeadlessServiceImport() {
 		}).Within(5*time.Second).ProbeEvery(time.Second).Should(BeEmpty(), reportNonConformant(""))
 	})
 }
+
+func testExternalNameService() {
+	t := newTestDriver()
+
+	BeforeEach(func() {
+		t.helloService.Spec.Type = corev1.ServiceTypeExternalName
+		t.helloService.Spec.ExternalName = "example.com"
+	})
+
+	JustBeforeEach(func() {
+		t.createServiceExport(&clients[0], newHelloServiceExport())
+	})
+
+	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.ensureNoServiceImport(&clients[0], helloServiceName,
+			"the ServiceImport should not exist for an ExternalName service")
+	})
+}