ISPN-16707 Sets EXPOSE_SERVICE_HOST env variable

infinispan · Oct 2, 2024 · f2007e4 · f2007e4
1 parent 692368c
commit f2007e4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,11 @@ and install [cert-manager](https://cert-manager.io) on it:
 make deploy-cert-manager
 ```
 
+## Setup a Kubernetes Cluster using Podman Desktop
+[Podman Desktop](https://podman-desktop.io/) a free and open-source tool that helps developers 
+work with Containers and Kubernetes. It makes it easy to connect local development to Kubernetes clusters 
+by using tools like Kind, Microshift, Openshift, and more.
+
 ## Development
 Build the Operator image and deploy to a cluster:
 
@@ -131,12 +136,13 @@ The target cluster should be specified by exporting or explicitly providing `KUB
 ### Env Variables
 The following variables can be exported or provided as part of the `make *test` call.
 
-| Variable              | Purpose                                                                              |
-|-----------------------|--------------------------------------------------------------------------------------|
-| `TEST_NAME`           | Specify a single test to run                                                         |
-| `TESTING_NAMESPACE`   | Specify the namespace/project for running test                                       |
-| `RUN_LOCAL_OPERATOR`  | Specify whether run operator locally or use the predefined installation              |
-| `EXPOSE_SERVICE_TYPE` | Specify expose service type. `NodePort \| LoadBalancer \| Route`.                    |
+| Variable              | Purpose                                                                             |
+|-----------------------|-------------------------------------------------------------------------------------|
+| `TEST_NAME`           | Specify a single test to run                                                        |
+| `TESTING_NAMESPACE`   | Specify the namespace/project for running test                                      |
+| `RUN_LOCAL_OPERATOR`  | Specify whether run operator locally or use the predefined installation             |
+| `EXPOSE_SERVICE_TYPE` | Specify expose service type. `NodePort \| LoadBalancer \| Route`.                   |
+| `EXPOSE_SERVICE_HOST` | Specify the service host. Useful to pass pass `localhost`.                          |
 | `PARALLEL_COUNT`      | Specify parallel test running count. Default is one, i.e. no parallel tests enabled. |
 
 ### Xsite

diff --git a/api/v1/types_util.go b/api/v1/types_util.go
@@ -303,6 +303,10 @@ func (ispn *Infinispan) IsExposed() bool {
 	return ispn.Spec.Expose != nil && ispn.Spec.Expose.Type != ""
 }
 
+func (ispn *Infinispan) GetExposeHost() string {
+	return ispn.Spec.Expose.Host
+}
+
 func (ispn *Infinispan) GetExposeType() ExposeType {
 	return ispn.Spec.Expose.Type
 }

diff --git a/test/e2e/utils/common.go b/test/e2e/utils/common.go
@@ -347,9 +347,17 @@ func WebServerService(name, namespace string) *corev1.Service {
 func ExposeServiceSpec(testKube *TestKubernetes) *ispnv1.ExposeSpec {
 	return &ispnv1.ExposeSpec{
 		Type: exposeServiceType(testKube),
+		Host: exposeServiceHost(),
 	}
 }
 
+func exposeServiceHost() string {
+	if ExposeServiceHost != "" {
+		return ExposeServiceHost
+	}
+	return ""
+}
+
 func exposeServiceType(testKube *TestKubernetes) ispnv1.ExposeType {
 	switch ispnv1.ExposeType(ExposeServiceType) {
 	case ispnv1.ExposeTypeNodePort, ispnv1.ExposeTypeLoadBalancer:

diff --git a/test/e2e/utils/constants.go b/test/e2e/utils/constants.go
@@ -36,9 +36,9 @@ var (
 	CleanupInfinispan = strings.ToUpper(constants.GetEnvWithDefault("CLEANUP_INFINISPAN_ON_FINISH", "true"))
 	SuiteMode, _      = strconv.ParseBool(constants.GetEnvWithDefault("SUITE_MODE", "false"))
 	ExposeServiceType = constants.GetEnvWithDefault("EXPOSE_SERVICE_TYPE", string(ispnv1.ExposeTypeNodePort))
-
-	Infrastructure = os.Getenv("TESTING_INFRASTRUCTURE")
-	Platform       = os.Getenv("TESTING_PLATFORM")
+	ExposeServiceHost = constants.GetEnvWithDefault("EXPOSE_SERVICE_HOST", "")
+	Infrastructure    = os.Getenv("TESTING_INFRASTRUCTURE")
+	Platform          = os.Getenv("TESTING_PLATFORM")
 
 	WebServerName       = "external-libs-web-server"
 	WebServerImageName  = constants.GetEnvWithDefault("TEST_NGINX_IMAGE", "quay.io/openshift-scale/nginx")

diff --git a/test/e2e/utils/kubernetes.go b/test/e2e/utils/kubernetes.go
@@ -508,8 +508,14 @@ func (k TestKubernetes) WaitForExternalService(ispn *ispnv1.Infinispan, timeout
 			if len(routeList.Items) > 0 {
 				switch ispn.GetExposeType() {
 				case ispnv1.ExposeTypeNodePort:
-					host, err := k.Kubernetes.GetNodeHost(log, context.TODO())
-					ExpectNoError(err)
+					var host string
+					print(ispn.GetExposeHost())
+					if ispn.GetExposeHost() != "" {
+						host = ispn.GetExposeHost()
+					} else {
+						host, err = k.Kubernetes.GetNodeHost(log, context.TODO())
+						ExpectNoError(err)
+					}
 					hostAndPort = fmt.Sprintf("%s:%d", host, getNodePort(&routeList.Items[0]))
 				case ispnv1.ExposeTypeLoadBalancer:
 					hostAndPort = k.Kubernetes.GetExternalAddress(&routeList.Items[0])