Implement GetManagedPort()

Author: kabicin

api/v1/webspherelibertyapplication_types.go

@@ -929,6 +929,16 @@ func (cr *WebSphereLibertyApplication) GetManageTLS() *bool {
 	return cr.Spec.ManageTLS
 }
 
+func (cr *WebSphereLibertyApplication) GetManagedPort() int {
+	if cr.GetService() != nil && cr.GetService().GetPort() != 0 {
+		return int(cr.GetService().GetPort())
+	}
+	if cr.GetManageTLS() == nil || *cr.GetManageTLS() {
+		return 9443
+	}
+	return 9080
+}
+
 // GetEnv returns slice of environment variables
 func (cr *WebSphereLibertyApplication) GetEnv() []corev1.EnvVar {
 	return cr.Spec.Env
@@ -1452,12 +1462,7 @@ func (cr *WebSphereLibertyApplication) Initialize() {
 	}
 
 	if cr.Spec.Service.Port == 0 {
-		if cr.Spec.ManageTLS == nil || *cr.Spec.ManageTLS {
-			cr.Spec.Service.Port = 9443
-
-		} else {
-			cr.Spec.Service.Port = 9080
-		}
+		cr.Spec.Service.Port = int32(cr.GetManagedPort())
 	}
 
 	// If TargetPorts on Serviceports are not set, default them to the Port value in the CR

utils/utils.go

@@ -28,6 +28,8 @@ import (
 
 	"math/rand/v2"
 
+	"github.com/application-stacks/runtime-component-operator/common"
+
 	wlv1 "github.com/WASdev/websphere-liberty-operator/api/v1"
 	rcoutils "github.com/application-stacks/runtime-component-operator/utils"
 	routev1 "github.com/openshift/api/route/v1"
@@ -1153,7 +1155,7 @@ func patchFileBasedProbe(defaultProbe *corev1.Probe, instanceProbe *corev1.Probe
 	defaultProbe = getOrInitProbe(defaultProbe)
 	instanceProbe = getOrInitProbe(instanceProbe)
 	isExecConfigured := instanceProbe.Exec != nil // this flag allows the user to override the ExecAction object to bring their own custom file-based health check
-	instanceProbe = rcoutils.CustomizeProbeDefaults(instanceProbe, defaultProbe)
+	instanceProbe = common.CustomizeProbeDefaults(instanceProbe, defaultProbe)
 	if !isExecConfigured {
 		configureFileBasedProbeExec(instanceProbe, scriptName, probeFile)
 	}
@@ -1186,14 +1188,15 @@ func customizeFileBasedProbes(appContainer *corev1.Container, instance *wlv1.Web
 	if appContainer == nil {
 		return
 	}
-	if instance.Spec.Probes.WebSphereLibertyApplicationProbes.Startup != nil {
-		appContainer.StartupProbe = patchFileBasedProbe(instance.Spec.Probes.WebSphereLibertyApplicationProbes.GetDefaultStartupProbe(instance), instance.Spec.Probes.Startup, StartupProbeFileBasedScriptName, StartupProbeFileName)
+	probes := instance.Spec.Probes.WebSphereLibertyApplicationProbes
+	if probes.Startup != nil {
+		appContainer.StartupProbe = patchFileBasedProbe(probes.GetDefaultStartupProbe(instance), probes.GetStartupProbe(), StartupProbeFileBasedScriptName, StartupProbeFileName)
 	}
-	if instance.Spec.Probes.WebSphereLibertyApplicationProbes.Liveness != nil {
-		appContainer.LivenessProbe = patchFileBasedProbe(instance.Spec.Probes.WebSphereLibertyApplicationProbes.GetDefaultLivenessProbe(instance), instance.Spec.Probes.Liveness, LivenessProbeFileBasedScriptName, LivenessProbeFileName)
+	if probes.Liveness != nil {
+		appContainer.LivenessProbe = patchFileBasedProbe(probes.GetDefaultLivenessProbe(instance), probes.GetLivenessProbe(), LivenessProbeFileBasedScriptName, LivenessProbeFileName)
 	}
-	if instance.Spec.Probes.WebSphereLibertyApplicationProbes.Readiness != nil {
-		appContainer.ReadinessProbe = patchFileBasedProbe(instance.Spec.Probes.WebSphereLibertyApplicationProbes.GetDefaultReadinessProbe(instance), instance.Spec.Probes.Readiness, ReadinessProbeFileBasedScriptName, ReadinessProbeFileName)
+	if probes.Readiness != nil {
+		appContainer.ReadinessProbe = patchFileBasedProbe(probes.GetDefaultReadinessProbe(instance), probes.GetReadinessProbe(), ReadinessProbeFileBasedScriptName, ReadinessProbeFileName)
 	}
 }