Add e2e test for OCPBUGS-63519

pkg/framework/framework.go

@@ -296,6 +296,26 @@ func SkipIfNotTechPreviewNoUpgrade(oc *gatherer.CLI, cl runtimeclient.Client) {
 	}
 }
 
+// SkipIfNotCustomNoUpgrade skip test if a cluster is not a CustomNoUpgrade cluster.
+func SkipIfNotCustomNoUpgrade(oc *gatherer.CLI, cl runtimeclient.Client) {
+	featureSet, err := oc.WithoutNamespace().Run("get").Args("featuregate", "cluster", "-o=jsonpath={.spec.featureSet}").Output()
+	Expect(err).NotTo(HaveOccurred(), "Failed to get featureSet")
+
+	if featureSet != string(configv1.CustomNoUpgrade) {
+		Skip("FeatureSet is not CustomNoUpgrade, skip it!")
+	}
+}
+
+// SkipIfNotTechPreviewNoUpgradeOrCustomNoUpgrade skip test if a cluster does not have TechPreviewNoUpgrade or CustomNoUpgrade featuregate enabled.
+func SkipIfNotTechPreviewNoUpgradeOrCustomNoUpgrade(oc *gatherer.CLI, cl runtimeclient.Client) {
+	featureSet, err := oc.WithoutNamespace().Run("get").Args("featuregate", "cluster", "-o=jsonpath={.spec.featureSet}").Output()
+	Expect(err).NotTo(HaveOccurred(), "Failed to get featureSet")
+
+	if featureSet != string(configv1.TechPreviewNoUpgrade) && featureSet != string(configv1.CustomNoUpgrade) {
+		Skip("Cluster does not have TechPreviewNoUpgrade or CustomNoUpgrade featuregate enabled. Not a valid cluster for this test.")
+	}
+}
+
 // GetCredentialsFromCluster get credentials from cluster.
 func GetCredentialsFromCluster(oc *gatherer.CLI) ([]byte, []byte, string) {
 	awscreds, err := oc.WithoutNamespace().Run("get").Args("secret/aws-creds", "-n", "kube-system", "-o", "json").Output()

pkg/operators/cluster-machine-approver.go

@@ -1,8 +1,14 @@
 package operators
 
 import (
+	"context"
+	"strconv"
+	"strings"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	discoveryv1 "k8s.io/api/discovery/v1"
+	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/openshift/cluster-api-actuator-pkg/pkg/framework"
 )
@@ -11,14 +17,28 @@ const (
 	cmaDeployment      = "machine-approver"
 	cmaClusterOperator = "machine-approver"
 	cmaNamespace       = "openshift-cluster-machine-approver"
+	cmaDeploymentcapi  = "machine-approver-capi"
+	cmaServicecapi     = "machine-approver-capi"
+	cmaServicePortcapi = 9194
+	cmaService         = "machine-approver"
+	cmaServicePort     = 9192
+	cmaMetricsPort     = 9193
+)
+
+var (
+	ctx    context.Context
+	client runtimeclient.Client
 )
 
+var _ = BeforeEach(func() {
+	var err error
+	ctx = framework.GetContext()
+	client, err = framework.LoadClient()
+	Expect(err).NotTo(HaveOccurred(), "Failed to load client")
+})
+
 var _ = Describe("Cluster Machine Approver deployment", framework.LabelMachineApprover, framework.LabelLEVEL0, func() {
 	It("should be available", func() {
-		ctx := framework.GetContext()
-
-		client, err := framework.LoadClient()
-		Expect(err).NotTo(HaveOccurred(), "Failed to load client")
 
 		Expect(framework.IsDeploymentAvailable(ctx, client, cmaDeployment, cmaNamespace)).To(BeTrue(),
 			"Failed to wait for cluster-machine-approver Deployment to become available")
@@ -27,12 +47,115 @@ var _ = Describe("Cluster Machine Approver deployment", framework.LabelMachineAp
 
 var _ = Describe("Cluster Machine Approver Cluster Operator Status", framework.LabelMachineApprover, framework.LabelLEVEL0, func() {
 	It("should be available", func() {
-		client, err := framework.LoadClient()
-		Expect(err).NotTo(HaveOccurred(), "Failed to load client")
-
-		ctx := framework.GetContext()
-
 		Expect(framework.WaitForStatusAvailableShort(ctx, client, cmaClusterOperator)).To(BeTrue(),
 			"Failed to wait for cluster-machine-approver Cluster Operator to be available")
 	})
 })
+
+var _ = Describe("Cluster Machine Approver CAPI Integration", framework.LabelMachineApprover, func() {
+	BeforeEach(func() {
+		// Pre-check: Skip if cluster doesn't have TechPreviewNoUpgrade or CustomNoUpgrade featuregate enabled
+		oc, err := framework.NewCLI()
+		Expect(err).NotTo(HaveOccurred(), "Failed to create CLI")
+
+		framework.SkipIfNotTechPreviewNoUpgradeOrCustomNoUpgrade(oc, client)
+	})
+
+	It("cluster-machine-approver must have endpoint slices for open ports the operator uses", func() {
+
+		// Test Case 1: Verify machine-approver-capi deployment has port 9193 configured with internal IP 127.0.0.1
+		deployment, err := framework.GetDeployment(ctx, client, cmaDeploymentcapi, cmaNamespace)
+		Expect(err).NotTo(HaveOccurred(), "Failed to get machine-approver-capi deployment")
+
+		// Check containers for the port configuration
+		foundInternalPort := false
+		foundUpstreamArg := false
+		for _, container := range deployment.Spec.Template.Spec.Containers {
+			// Check for upstream argument with 127.0.0.1:9193
+			for _, arg := range container.Args {
+				if strings.Contains(arg, "--upstream=") && strings.Contains(arg, "127.0.0.1:"+strconv.Itoa(cmaMetricsPort)) {
+					foundUpstreamArg = true
+				}
+			}
+
+			// Check for environment variable with port 9193
+			for _, env := range container.Env {
+				if env.Value == "9193" || strings.Contains(env.Value, "9193") {
+					foundInternalPort = true
+				}
+			}
+		}
+
+		Expect(foundUpstreamArg && foundInternalPort).To(BeTrue(),
+			"Deployment machine-approver-capi should have port 9193 configured with 127.0.0.1 (internal)")
+
+		// Test Case 2: Verify services exist at ports 9192 and 9194
+		// Check machine-approver service (port 9192)
+		maSvc, err := framework.GetService(ctx, client, cmaService, cmaNamespace)
+		Expect(err).NotTo(HaveOccurred(), "Failed to get machine-approver service")
+
+		foundMaPort := false
+		for _, port := range maSvc.Spec.Ports {
+			if port.Port == cmaServicePort {
+				foundMaPort = true
+				break
+			}
+		}
+		Expect(foundMaPort).To(BeTrue(),
+			"Service machine-approver should have port 9192")
+
+		// Check machine-approver-capi service (port 9194)
+		maCapiSvc, err := framework.GetService(ctx, client, cmaServicecapi, cmaNamespace)
+		Expect(err).NotTo(HaveOccurred(), "Failed to get machine-approver-capi service")
+
+		foundCapiPort := false
+		for _, port := range maCapiSvc.Spec.Ports {
+			if port.Port == cmaServicePortcapi {
+				foundCapiPort = true
+				break
+			}
+		}
+		Expect(foundCapiPort).To(BeTrue(),
+			"Service machine-approver-capi should have port 9194")
+
+		// Test Case 3: Verify endpoint slices exist for above ports
+		Eventually(func() bool {
+			endpointSlices := &discoveryv1.EndpointSliceList{}
+			err := client.List(ctx, endpointSlices, runtimeclient.InNamespace(cmaNamespace))
+			if err != nil {
+				return false
+			}
+
+			// Find endpoint slices for machine-approver (port 9192)
+			foundMaEndpoint := false
+			foundCapiEndpoint := false
+
+			for _, slice := range endpointSlices.Items {
+				serviceName := slice.Labels["kubernetes.io/service-name"]
+
+				// Check for machine-approver endpoint slice with port 9192
+				if serviceName == cmaService {
+					for _, port := range slice.Ports {
+						if port.Port != nil && *port.Port == cmaServicePort {
+							foundMaEndpoint = true
+							break
+						}
+					}
+				}
+
+				// Check for machine-approver-capi endpoint slice with port 9194
+				if serviceName == cmaServicecapi {
+					for _, port := range slice.Ports {
+						if port.Port != nil && *port.Port == cmaServicePortcapi {
+							foundCapiEndpoint = true
+							break
+						}
+					}
+				}
+			}
+
+			return foundMaEndpoint && foundCapiEndpoint
+		}, framework.WaitShort, framework.RetryMedium).Should(BeTrue(),
+			"EndpointSlices for machine-approver (port 9192) and machine-approver-capi (port 9194) should exist")
+	})
+})