Semeru health port to support using 38400

Author: kabicin

internal/controller/semeru_compiler.go

@@ -46,6 +46,7 @@ const (
 	SemeruGenerationLabelNameSuffix         = "/semeru-compiler-generation"
 	StatusReferenceSemeruGeneration         = "semeruGeneration"
 	StatusReferenceSemeruInstancesCompleted = "semeruInstancesCompleted"
+	SemeruContainerName                     = "compiler"
 )
 
 func getCompilerMeta(wlva *wlv1.WebSphereLibertyApplication) metav1.ObjectMeta {
@@ -55,6 +56,15 @@ func getCompilerMeta(wlva *wlv1.WebSphereLibertyApplication) metav1.ObjectMeta {
 	}
 }
 
+func getSemeruDeploymentContainer(deploy *appsv1.Deployment) (corev1.Container, error) {
+	for _, container := range deploy.Spec.Template.Spec.Containers {
+		if container.Name == SemeruContainerName {
+			return container, nil
+		}
+	}
+	return corev1.Container{}, fmt.Errorf("could not find the Semeru Deployment container")
+}
+
 // Returns true if the semeru health port configuration has changed otherwise false
 func (r *ReconcileWebSphereLiberty) upgradeSemeruHealthPorts(inputMeta metav1.ObjectMeta, wlva *wlv1.WebSphereLibertyApplication) bool {
 	var healthPort int32 = 38600
@@ -63,15 +73,17 @@ func (r *ReconcileWebSphereLiberty) upgradeSemeruHealthPorts(inputMeta metav1.Ob
 	}
 	semeruDeployment := &appsv1.Deployment{ObjectMeta: inputMeta}
 	if r.GetClient().Get(context.TODO(), types.NamespacedName{Name: semeruDeployment.Name, Namespace: semeruDeployment.Namespace}, semeruDeployment) == nil {
+		container, err := getSemeruDeploymentContainer(semeruDeployment)
+		if err != nil {
+			return false
+		}
+		if healthPort == 38400 && len(container.Ports) > 1 {
+			return true
+		}
 		containsHealthPort := false
-		for _, container := range semeruDeployment.Spec.Template.Spec.Containers {
-			for _, port := range container.Ports {
-				if port.ContainerPort == healthPort {
-					containsHealthPort = true
-				}
-			}
-			if containsHealthPort {
-				break
+		for _, port := range container.Ports {
+			if port.ContainerPort == healthPort {
+				containsHealthPort = true
 			}
 		}
 		if !containsHealthPort {
@@ -399,7 +411,7 @@ func (r *ReconcileWebSphereLiberty) reconcileSemeruDeployment(wlva *wlv1.WebSphe
 			},
 			Containers: []corev1.Container{
 				{
-					Name:            "compiler",
+					Name:            SemeruContainerName,
 					Image:           wlva.Status.GetImageReference(),
 					ImagePullPolicy: *wlva.GetPullPolicy(),
 					Command:         []string{"jitserver"},