Merge pull request #128 from umago/lsstack-health

Use HTTP health check for lightspeed-stack container

Author: openshift-merge-bot[bot]

internal/controller/constants.go

@@ -85,6 +85,16 @@ const (
 	LlamaStackStartupProbeFailureThreshold = int32(30)
 	LlamaStackProbeFailureThreshold        = int32(3)
 
+	// Health probe settings for the lightspeed-stack container.
+	// The startup probe allows up to 30 failures (300s) for initialization,
+	// while liveness and readiness probes use a tighter threshold of 3 failures.
+	LightspeedStackLivenessPath                 = "/liveness"
+	LightspeedStackReadinessPath                = "/readiness"
+	LightspeedStackProbePeriodSeconds           = int32(10)
+	LightspeedStackProbeTimeoutSeconds          = int32(5)
+	LightspeedStackStartupProbeFailureThreshold = int32(30)
+	LightspeedStackProbeFailureThreshold        = int32(3)
+
 	// Data Exporter
 	ExporterConfigVolumeName       = "exporter-config"
 	ExporterConfigMountPath        = "/etc/config"

internal/controller/lcore_config.go

@@ -112,7 +112,8 @@ func buildLCoreUserDataCollectionConfig(_ *common_helper.Helper, instance *apiv1
 
 func buildLCoreAuthenticationConfig(_ *common_helper.Helper, _ *apiv1beta1.OpenStackLightspeed) map[string]interface{} {
 	return map[string]interface{}{
-		"module": "k8s",
+		"module":                 "k8s",
+		"skip_for_health_probes": true,
 	}
 }
 

internal/controller/lcore_deployment.go

@@ -147,6 +147,7 @@ func buildLCorePodTemplateSpec(h *common_helper.Helper, ctx context.Context, ins
 		Ports:          []corev1.ContainerPort{{Name: "https", ContainerPort: OpenStackLightspeedAppServerContainerPort}},
 		VolumeMounts:   lightspeedStackMounts,
 		Env:            lsEnvVars,
+		StartupProbe:   buildLightspeedStackStartupProbe(),
 		LivenessProbe:  buildLightspeedStackLivenessProbe(),
 		ReadinessProbe: buildLightspeedStackReadinessProbe(),
 		Resources: corev1.ResourceRequirements{
@@ -651,33 +652,51 @@ func buildLightspeedStackEnvVars(instance *apiv1beta1.OpenStackLightspeed) []cor
 	return envVars
 }
 
+// buildLightspeedStackStartupProbe returns the startup probe for the lightspeed-stack container.
+func buildLightspeedStackStartupProbe() *corev1.Probe {
+	return &corev1.Probe{
+		ProbeHandler: corev1.ProbeHandler{
+			HTTPGet: &corev1.HTTPGetAction{
+				Path:   LightspeedStackReadinessPath,
+				Port:   intstr.FromInt32(OpenStackLightspeedAppServerContainerPort),
+				Scheme: corev1.URISchemeHTTPS,
+			},
+		},
+		PeriodSeconds:    LightspeedStackProbePeriodSeconds,
+		TimeoutSeconds:   LightspeedStackProbeTimeoutSeconds,
+		FailureThreshold: LightspeedStackStartupProbeFailureThreshold,
+	}
+}
+
 // buildLightspeedStackLivenessProbe returns the liveness probe for the lightspeed-stack container.
 func buildLightspeedStackLivenessProbe() *corev1.Probe {
 	return &corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
-			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt32(OpenStackLightspeedAppServerContainerPort),
+			HTTPGet: &corev1.HTTPGetAction{
+				Path:   LightspeedStackLivenessPath,
+				Port:   intstr.FromInt32(OpenStackLightspeedAppServerContainerPort),
+				Scheme: corev1.URISchemeHTTPS,
 			},
 		},
-		InitialDelaySeconds: 30,
-		PeriodSeconds:       10,
-		TimeoutSeconds:      5,
-		FailureThreshold:    3,
+		PeriodSeconds:    LightspeedStackProbePeriodSeconds,
+		TimeoutSeconds:   LightspeedStackProbeTimeoutSeconds,
+		FailureThreshold: LightspeedStackProbeFailureThreshold,
 	}
 }
 
 // buildLightspeedStackReadinessProbe returns the readiness probe for the lightspeed-stack container.
 func buildLightspeedStackReadinessProbe() *corev1.Probe {
 	return &corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
-			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt32(OpenStackLightspeedAppServerContainerPort),
+			HTTPGet: &corev1.HTTPGetAction{
+				Path:   LightspeedStackReadinessPath,
+				Port:   intstr.FromInt32(OpenStackLightspeedAppServerContainerPort),
+				Scheme: corev1.URISchemeHTTPS,
 			},
 		},
-		InitialDelaySeconds: 30,
-		PeriodSeconds:       10,
-		TimeoutSeconds:      5,
-		FailureThreshold:    3,
+		PeriodSeconds:    LightspeedStackProbePeriodSeconds,
+		TimeoutSeconds:   LightspeedStackProbeTimeoutSeconds,
+		FailureThreshold: LightspeedStackProbeFailureThreshold,
 	}
 }
 

test/kuttl/common/expected-configs/lightspeed-stack-okp.yaml

@@ -1,5 +1,6 @@
 authentication:
   module: k8s
+  skip_for_health_probes: true
 byok_rag:
 - rag_id: vs_UUID
   vector_db_id: vs_UUID

test/kuttl/common/expected-configs/lightspeed-stack-update.yaml

@@ -1,5 +1,6 @@
 authentication:
   module: k8s
+  skip_for_health_probes: true
 byok_rag:
 - rag_id: vs_UUID
   vector_db_id: vs_UUID

test/kuttl/common/expected-configs/lightspeed-stack.yaml

@@ -1,5 +1,6 @@
 authentication:
   module: k8s
+  skip_for_health_probes: true
 byok_rag:
 - rag_id: vs_UUID
   vector_db_id: vs_UUID