Support Semeru Cloud Compiler health probe config

api/v1/webspherelibertyapplication_types.go

@@ -520,6 +520,15 @@ 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 settings for the Semeru Cloud Compiler.
+	// +operator-sdk:csv:customresourcedefinitions:order=55,type=spec,displayName="Health"
+	Health *WebSphereLibertyApplicationSemeruCloudCompilerHealth `json:"health,omitempty"`
+}
+
+type WebSphereLibertyApplicationSemeruCloudCompilerHealth struct {
+	// The health port for the Semeru Cloud Compiler. Defaults to 38600.
+	// +operator-sdk:csv:customresourcedefinitions:order=60,type=spec,displayName="Port",xDescriptors="urn:alm:descriptor:com.tectonic.ui:number"
+	Port *int32 `json:"port,omitempty"`
 }
 
 // Defines SemeruCompiler status
@@ -1287,6 +1296,19 @@ func (scc *WebSphereLibertyApplicationSemeruCloudCompiler) GetReplicas() *int32
 	return &one
 }
 
+// GetHealth returns the Semeru Cloud Compiler Health configuration
+func (scc *WebSphereLibertyApplicationSemeruCloudCompiler) GetHealth() *WebSphereLibertyApplicationSemeruCloudCompilerHealth {
+	return scc.Health
+}
+
+func (scch *WebSphereLibertyApplicationSemeruCloudCompilerHealth) GetPort() *int32 {
+	if scch.Port != nil {
+		return scch.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 {

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

@@ -538,45 +538,53 @@ spec:
           be removed from service endpoints if the probe fails.
         displayName: Readiness Probe
         path: probes.readiness
+      - description: Enable the Semeru Cloud Compiler. Defaults to false.
+        displayName: Enable
+        path: semeruCloudCompiler.enable
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
       - description: Probe to determine successful initialization. If specified, other
           probes are not executed until this completes successfully.
         displayName: Startup Probe
         path: probes.startup
+      - description: Number of desired pods for the Semeru Cloud Compiler. Defaults
+          to 1.
+        displayName: Replicas
+        path: semeruCloudCompiler.replicas
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:podCount
       - description: Disable the creation of the network policy. Defaults to false.
         displayName: Disable
         path: networkPolicy.disable
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: Enable the Semeru Cloud Compiler. Defaults to false.
-        displayName: Enable
-        path: semeruCloudCompiler.enable
+      - description: 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.
+        displayName: Resource Requirements
+        path: semeruCloudCompiler.resources
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
       - description: Specify the labels of namespaces that incoming traffic is allowed
           from.
         displayName: Namespace Labels
         path: networkPolicy.namespaceLabels
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
-      - description: Number of desired pods for the Semeru Cloud Compiler. Defaults
-          to 1.
-        displayName: Replicas
-        path: semeruCloudCompiler.replicas
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podCount
+      - description: The health settings for the Semeru Cloud Compiler.
+        displayName: Health
+        path: semeruCloudCompiler.health
       - description: Specify the labels of pod(s) that incoming traffic is allowed
           from.
         displayName: From Labels
         path: networkPolicy.fromLabels
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
-      - description: 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.
-        displayName: Resource Requirements
-        path: semeruCloudCompiler.resources
+      - description: The health port for the Semeru Cloud Compiler. Defaults to 38600.
+        displayName: Port
+        path: semeruCloudCompiler.health.port
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
+        - 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'

bundle/manifests/liberty.websphere.ibm.com_webspherelibertyapplications.yaml

@@ -4173,6 +4173,15 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  health:
+                    description: The health settings for the Semeru Cloud Compiler.
+                    properties:
+                      port:
+                        description: The health port for the Semeru Cloud Compiler.
+                          Defaults to 38600.
+                        format: int32
+                        type: integer
+                    type: object
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.

config/crd/bases/liberty.websphere.ibm.com_webspherelibertyapplications.yaml

@@ -4169,6 +4169,15 @@ spec:
                   enable:
                     description: Enable the Semeru Cloud Compiler. Defaults to false.
                     type: boolean
+                  health:
+                    description: The health settings for the Semeru Cloud Compiler.
+                    properties:
+                      port:
+                        description: The health port for the Semeru Cloud Compiler.
+                          Defaults to 38600.
+                        format: int32
+                        type: integer
+                    type: object
                   replicas:
                     description: Number of desired pods for the Semeru Cloud Compiler.
                       Defaults to 1.

config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml

@@ -480,45 +480,53 @@ spec:
           be removed from service endpoints if the probe fails.
         displayName: Readiness Probe
         path: probes.readiness
+      - description: Enable the Semeru Cloud Compiler. Defaults to false.
+        displayName: Enable
+        path: semeruCloudCompiler.enable
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
       - description: Probe to determine successful initialization. If specified, other
           probes are not executed until this completes successfully.
         displayName: Startup Probe
         path: probes.startup
+      - description: Number of desired pods for the Semeru Cloud Compiler. Defaults
+          to 1.
+        displayName: Replicas
+        path: semeruCloudCompiler.replicas
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:podCount
       - description: Disable the creation of the network policy. Defaults to false.
         displayName: Disable
         path: networkPolicy.disable
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: Enable the Semeru Cloud Compiler. Defaults to false.
-        displayName: Enable
-        path: semeruCloudCompiler.enable
+      - description: 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.
+        displayName: Resource Requirements
+        path: semeruCloudCompiler.resources
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
       - description: Specify the labels of namespaces that incoming traffic is allowed
           from.
         displayName: Namespace Labels
         path: networkPolicy.namespaceLabels
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
-      - description: Number of desired pods for the Semeru Cloud Compiler. Defaults
-          to 1.
-        displayName: Replicas
-        path: semeruCloudCompiler.replicas
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podCount
+      - description: The health settings for the Semeru Cloud Compiler.
+        displayName: Health
+        path: semeruCloudCompiler.health
       - description: Specify the labels of pod(s) that incoming traffic is allowed
           from.
         displayName: From Labels
         path: networkPolicy.fromLabels
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:text
-      - description: 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.
-        displayName: Resource Requirements
-        path: semeruCloudCompiler.resources
+      - description: The health port for the Semeru Cloud Compiler. Defaults to 38600.
+        displayName: Port
+        path: semeruCloudCompiler.health.port
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
+        - 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'