[Feature] Enable Probes for Single & Gateway (#1922)

Author: ajanikow

CHANGELOG.md

@@ -9,6 +9,7 @@
 - (Feature) (Platform) Packer
 - (Feature) Manual Upgrade Mode
 - (Feature) (Platform) SchedulerV2 Defaults Revert
+- (Bugfix) Enable Probes for Single & Gateway
 
 ## [1.2.49](https://github.com/arangodb/kube-arangodb/tree/1.2.49) (2025-06-17)
 - (Maintenance) Optimize go.mod

pkg/deployment/deployment_core_test.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -1441,6 +1441,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
 
 				testCase.ExpectedPod.Spec.Containers[0].LivenessProbe = createTestLivenessProbe(httpProbe, true, authLiveness, shared.ServerPortName)
 				testCase.ExpectedPod.Spec.Containers[0].ReadinessProbe = createTestReadinessProbe(httpProbe, true, authReadiness)
+				testCase.ExpectedPod.Spec.Containers[0].StartupProbe = createTestStartupProbe(httpProbe, true, authLiveness, 720*6)
 			},
 			ExpectedEvent: "member single is created",
 			ExpectedPod: core.Pod{
@@ -1509,6 +1510,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
 
 				testCase.ExpectedPod.Spec.Containers[0].LivenessProbe = createTestLivenessProbe(httpProbe, true, authLiveness, shared.ServerPortName)
 				testCase.ExpectedPod.Spec.Containers[0].ReadinessProbe = createTestReadinessProbe(httpProbe, true, authReadiness)
+				testCase.ExpectedPod.Spec.Containers[0].StartupProbe = createTestStartupProbe(httpProbe, true, authLiveness, 720*6)
 			},
 			ExpectedEvent: "member single is created",
 			ExpectedPod: core.Pod{

pkg/deployment/deployment_features_test.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -364,6 +364,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
 
 				testCase.ExpectedPod.Spec.Containers[0].LivenessProbe = createTestLivenessProbe(httpProbe, false, "", shared.ServerPortName)
 				testCase.ExpectedPod.Spec.Containers[0].ReadinessProbe = createTestReadinessProbe(httpProbe, false, "")
+				testCase.ExpectedPod.Spec.Containers[0].StartupProbe = createTestStartupProbe(httpProbe, false, "", 720*6)
 			},
 			ExpectedEvent: "member single is created",
 			ExpectedPod: core.Pod{
@@ -429,6 +430,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
 
 				testCase.ExpectedPod.Spec.Containers[0].LivenessProbe = createTestLivenessProbe(httpProbe, false, "", shared.ServerPortName)
 				testCase.ExpectedPod.Spec.Containers[0].ReadinessProbe = createTestReadinessProbe(httpProbe, false, "")
+				testCase.ExpectedPod.Spec.Containers[0].StartupProbe = createTestStartupProbe(httpProbe, false, "", 720*6)
 			},
 			ExpectedEvent: "member single is created",
 			ExpectedPod: core.Pod{
@@ -494,6 +496,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
 
 				testCase.ExpectedPod.Spec.Containers[0].LivenessProbe = createTestLivenessProbe(httpProbe, false, "", shared.ServerPortName)
 				testCase.ExpectedPod.Spec.Containers[0].ReadinessProbe = createTestReadinessProbe(httpProbe, false, "")
+				testCase.ExpectedPod.Spec.Containers[0].StartupProbe = createTestStartupProbe(httpProbe, false, "", 720*6)
 			},
 			ExpectedEvent: "member single is created",
 			ExpectedPod: core.Pod{

pkg/deployment/pod/probes.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ type probes struct {
 // probeMap defines default values and if Probe can be enabled
 var probeMap = map[api.ServerGroup]probes{
 	api.ServerGroupSingle: {
-		startup:   newProbe(true, false),
+		startup:   newProbe(true, true),
 		liveness:  newProbe(true, true),
 		readiness: newProbe(true, true),
 	},
@@ -81,9 +81,9 @@ var probeMap = map[api.ServerGroup]probes{
 		liveness:  newProbe(true, true),
 		readiness: newProbe(false, false),
 	},
-	api.ServerGroupGateways: { // TODO: Enable Probes
-		startup:   newProbe(false, false),
-		liveness:  newProbe(false, false),
-		readiness: newProbe(false, false),
+	api.ServerGroupGateways: {
+		startup:   newProbe(true, true),
+		liveness:  newProbe(true, false),
+		readiness: newProbe(true, true),
 	},
 }

pkg/deployment/resources/pod_creator_probes.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -207,6 +207,11 @@ func (r *Resources) probeBuilders(imageInfo api.ImageInfo) map[api.ServerGroup]p
 			liveness:  r.probeBuilderLivenessCoreSelect(api.ServerGroupCoordinators, imageInfo),
 			readiness: r.probeBuilderReadinessCoreSelect(),
 		},
+		api.ServerGroupGateways: {
+			startup:   r.probeBuilderStartupCoreSelect(api.ServerGroupGateways, imageInfo),
+			liveness:  r.probeBuilderLivenessCoreSelect(api.ServerGroupGateways, imageInfo),
+			readiness: r.probeBuilderReadinessCoreSelect(),
+		},
 		api.ServerGroupSyncMasters: {
 			startup:   r.probeBuilderStartupSync,
 			liveness:  r.probeBuilderLivenessSync,
@@ -490,10 +495,10 @@ func getProbeRetries(group api.ServerGroup) (int32, int32) {
 	// Set default values.
 	period, howLong := 5*time.Second, 300*time.Second
 
-	if group == api.ServerGroupDBServers {
+	if group == api.ServerGroupDBServers || group == api.ServerGroupSingle {
 		// Wait 6 hours (in seconds) for WAL replay.
 		howLong = 6 * time.Hour
-	} else if group == api.ServerGroupCoordinators {
+	} else if group == api.ServerGroupCoordinators || group == api.ServerGroupGateways {
 		// Coordinator should wait for agents, but agents could take more time to spin up.
 		howLong = time.Hour
 	}