Add semeru health port flag

kabicin · kabicin · commit d0fa452cef87 · 2025-05-05T13:39:08.000-04:00
diff --git a/api/v1/webspherelibertyapplication_types.go b/api/v1/webspherelibertyapplication_types.go
@@ -520,6 +520,9 @@ type WebSphereLibertyApplicationSemeruCloudCompiler struct {
 	// Resource requests and limits for the Semeru Cloud Compiler. The CPU defaults to 100m with a limit of 2000m. The memory defaults to 800Mi, with a limit of 1200Mi.
 	// +operator-sdk:csv:customresourcedefinitions:order=54,type=spec,displayName="Resource Requirements",xDescriptors="urn:alm:descriptor:com.tectonic.ui:resourceRequirements"
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
+	// The health port for the Semeru Cloud Compiler. Defaults to 38600.
+	// +operator-sdk:csv:customresourcedefinitions:order=55,type=spec,displayName="Port",xDescriptors="urn:alm:descriptor:com.tectonic.ui:number"
+	Port *int32 `json:"port,omitempty"`
 }
 
 // Defines SemeruCompiler status
@@ -1287,6 +1290,14 @@ func (scc *WebSphereLibertyApplicationSemeruCloudCompiler) GetReplicas() *int32
 	return &one
 }
 
+func (scc *WebSphereLibertyApplicationSemeruCloudCompiler) GetPort() *int32 {
+	if scc.Port != nil {
+		return scc.Port
+	}
+	defaultPort := int32(38600)
+	return &defaultPort
+}
+
 // GetTopologySpreadConstraints returns the pod topology spread constraints configuration
 func (cr *WebSphereLibertyApplication) GetTopologySpreadConstraints() common.BaseComponentTopologySpreadConstraints {
 	if cr.Spec.TopologySpreadConstraints == nil {
diff --git a/bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml b/bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml
@@ -577,6 +577,11 @@ spec:
         path: semeruCloudCompiler.resources
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
+      - description: The health port for the Semeru Cloud Compiler. Defaults to 38600.
+        displayName: Port
+        path: semeruCloudCompiler.port
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: 'Product edition. Defaults to IBM WebSphere Application Server.
           Other options: IBM WebSphere Application Server Liberty Core, IBM WebSphere
           Application Server Network Deployment'
diff --git a/bundle/manifests/liberty.websphere.ibm.com_webspherelibertyapplications.yaml b/bundle/manifests/liberty.websphere.ibm.com_webspherelibertyapplications.yaml
@@ -4173,6 +4173,11 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  port:
+                    description: The health port for the Semeru Cloud Compiler. Defaults
+                      to 38600.
+                    format: int32
+                    type: integer
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.
diff --git a/config/crd/bases/liberty.websphere.ibm.com_webspherelibertyapplications.yaml b/config/crd/bases/liberty.websphere.ibm.com_webspherelibertyapplications.yaml
@@ -4169,6 +4169,11 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  port:
+                    description: The health port for the Semeru Cloud Compiler. Defaults
+                      to 38600.
+                    format: int32
+                    type: integer
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.
diff --git a/config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml b/config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml
@@ -519,6 +519,11 @@ spec:
         path: semeruCloudCompiler.resources
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
+      - description: The health port for the Semeru Cloud Compiler. Defaults to 38600.
+        displayName: Port
+        path: semeruCloudCompiler.port
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: 'Product edition. Defaults to IBM WebSphere Application Server.
           Other options: IBM WebSphere Application Server Liberty Core, IBM WebSphere
           Application Server Network Deployment'
diff --git a/internal/controller/semeru_compiler.go b/internal/controller/semeru_compiler.go
@@ -255,6 +255,7 @@ func (r *ReconcileWebSphereLiberty) deleteCompletedSemeruInstances(wlva *wlv1.We
 }
 
 func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphereLibertyApplication, deploy *appsv1.Deployment) {
+	var port int32 = 38400
 	deploy.Labels = getLabels(wlva)
 	deploy.Spec.Strategy.Type = appsv1.RecreateDeploymentStrategyType
 
@@ -276,11 +277,18 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 	limitsMemory := getQuantityFromLimitsOrDefault(instanceResources, corev1.ResourceMemory, "1200Mi")
 	limitsCPU := getQuantityFromLimitsOrDefault(instanceResources, corev1.ResourceCPU, "2000m")
 
+	portNumber := *semeruCloudCompiler.GetPort()
+	var portIntOrStr intstr.IntOrString
+	if portNumber == port {
+		portIntOrStr = intstr.FromInt32(port)
+	} else {
+		portIntOrStr = intstr.FromString(fmt.Sprintf("%d-tcp", port))
+	}
 	// Liveness probe
 	livenessProbe := corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
 			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt(38400),
+				Port: portIntOrStr,
 			},
 		},
 		InitialDelaySeconds: 10,
@@ -291,7 +299,7 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 	readinessProbe := corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
 			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt(38400),
+				Port: portIntOrStr,
 			},
 		},
 		InitialDelaySeconds: 5,
@@ -301,6 +309,22 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 	semeruPodMatchLabels := map[string]string{
 		"app.kubernetes.io/instance": getSemeruCompilerNameWithGeneration(wlva),
 	}
+	containerPorts := make([]corev1.ContainerPort, 0)
+	containerPorts = append(containerPorts, corev1.ContainerPort{
+		ContainerPort: port,
+		Protocol:      corev1.ProtocolTCP,
+	})
+
+	healthProbesFlag := ""
+	if portNumber != port {
+		healthProbesFlag = " -XX:+JITServerHealthProbes" + fmt.Sprintf(" -XX:JITServerHealthProbePort=%d", portNumber)
+		containerPorts[0].Name = fmt.Sprintf("%d-tcp", port)
+		containerPorts = append(containerPorts, corev1.ContainerPort{
+			Name:          fmt.Sprintf("%d-tcp", portNumber),
+			ContainerPort: portNumber,
+			Protocol:      corev1.ProtocolTCP,
+		})
+	}
 	deploy.Spec.Template = corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      getLabels(wlva),
@@ -337,12 +361,7 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 					Image:           wlva.Status.GetImageReference(),
 					ImagePullPolicy: *wlva.GetPullPolicy(),
 					Command:         []string{"jitserver"},
-					Ports: []corev1.ContainerPort{
-						{
-							ContainerPort: 38400,
-							Protocol:      corev1.ProtocolTCP,
-						},
-					},
+					Ports:           containerPorts,
 					Resources: corev1.ResourceRequirements{
 						Requests: corev1.ResourceList{
 							corev1.ResourceMemory: requestsMemory,
@@ -356,6 +375,7 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 					Env: []corev1.EnvVar{
 						{Name: "OPENJ9_JAVA_OPTIONS", Value: "-XX:+JITServerLogConnections" +
 							" -XX:+JITServerShareROMClasses" +
+							healthProbesFlag +
 							" -XX:JITServerSSLKey=/etc/x509/certs/tls.key" +
 							" -XX:JITServerSSLCert=/etc/x509/certs/tls.crt"},
 					},
@@ -417,12 +437,26 @@ func reconcileSemeruService(svc *corev1.Service, wlva *wlv1.WebSphereLibertyAppl
 	svc.Labels = getLabels(wlva)
 	svc.Spec.Selector = getSelectors(wlva)
 	utils.CustomizeServiceAnnotations(svc)
-	if len(svc.Spec.Ports) == 0 {
+	numPorts := len(svc.Spec.Ports)
+	if numPorts == 0 {
 		svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{})
 	}
 	svc.Spec.Ports[0].Protocol = corev1.ProtocolTCP
 	svc.Spec.Ports[0].Port = port
 	svc.Spec.Ports[0].TargetPort = intstr.FromInt(int(port))
+	portNumber := *wlva.GetSemeruCloudCompiler().GetPort()
+	if portNumber != port {
+		numPorts = len(svc.Spec.Ports)
+		if numPorts == 1 {
+			svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{})
+		}
+		svc.Spec.Ports[0].Name = fmt.Sprintf("%d-tcp", port)
+		svc.Spec.Ports[0].TargetPort = intstr.FromString(fmt.Sprintf("%d-tcp", port))
+		svc.Spec.Ports[1].Name = fmt.Sprintf("%d-tcp", portNumber)
+		svc.Spec.Ports[1].Protocol = corev1.ProtocolTCP
+		svc.Spec.Ports[1].Port = portNumber
+		svc.Spec.Ports[1].TargetPort = intstr.FromString(fmt.Sprintf("%d-tcp", portNumber))
+	}
 	svc.Spec.SessionAffinity = corev1.ServiceAffinityClientIP
 	svc.Spec.SessionAffinityConfig = &corev1.SessionAffinityConfig{
 		ClientIP: &corev1.ClientIPConfig{
@@ -585,14 +619,13 @@ func (r *ReconcileWebSphereLiberty) getSemeruJavaOptions(instance *wlv1.WebSpher
 			certificateLocation = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
 		}
 		jitServerAddress := instance.Status.SemeruCompiler.ServiceHostname
-		jitSeverOptions := fmt.Sprintf("-XX:+UseJITServer -XX:+JITServerLogConnections -XX:JITServerAddress=%v -XX:JITServerSSLRootCerts=%v",
-			jitServerAddress, certificateLocation)
+		jitServerOptions := fmt.Sprintf("-XX:+UseJITServer -XX:+JITServerLogConnections -XX:JITServerAddress=%v -XX:JITServerSSLRootCerts=%v", jitServerAddress, certificateLocation)
 
 		args := []string{
 			"/bin/bash",
 			"-c",
-			"export OPENJ9_JAVA_OPTIONS=\"$OPENJ9_JAVA_OPTIONS " + jitSeverOptions +
-				"\" && export OPENJ9_RESTORE_JAVA_OPTIONS=\"$OPENJ9_RESTORE_JAVA_OPTIONS " + jitSeverOptions +
+			"export OPENJ9_JAVA_OPTIONS=\"$OPENJ9_JAVA_OPTIONS " + jitServerOptions +
+				"\" && export OPENJ9_RESTORE_JAVA_OPTIONS=\"$OPENJ9_RESTORE_JAVA_OPTIONS " + jitServerOptions +
 				"\" && server run",
 		}
 		return args
diff --git a/internal/deploy/kubectl/websphereliberty-app-crd.yaml b/internal/deploy/kubectl/websphereliberty-app-crd.yaml
@@ -4172,6 +4172,11 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  port:
+                    description: The health port for the Semeru Cloud Compiler. Defaults
+                      to 38600.
+                    format: int32
+                    type: integer
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.
diff --git a/internal/deploy/kustomize/daily/base/websphere-liberty-crd.yaml b/internal/deploy/kustomize/daily/base/websphere-liberty-crd.yaml
@@ -4172,6 +4172,11 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  port:
+                    description: The health port for the Semeru Cloud Compiler. Defaults
+                      to 38600.
+                    format: int32
+                    type: integer
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.
