update ipam startup probe and docs

Nordix · Aug 9, 2024 · f192489 · f192489
1 parent 1e2111c
commit f192489
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/cmd/ipam/main.go b/cmd/ipam/main.go
@@ -103,6 +103,9 @@ func main() {
 
 	// create and start health server
 	ctx = health.CreateChecker(ctx)
+	if err := health.RegisterStartupSubservices(ctx); err != nil {
+		logger.Error(err, "RegisterStartupSubservices")
+	}
 	if err := health.RegisterReadinessSubservices(ctx, health.IPAMReadinessServices...); err != nil {
 		logger.Error(err, "RegisterReadinessSubservices")
 	}

diff --git a/config/templates/charts/meridio/deployment/ipam.yaml b/config/templates/charts/meridio/deployment/ipam.yaml
@@ -31,7 +31,7 @@ spec:
               command:
                 - /bin/grpc_health_probe
                 - -addr=unix:///tmp/health.sock
-                - -service=
+                - -service=Startup
                 - -connect-timeout=400ms
                 - -rpc-timeout=400ms
             initialDelaySeconds: 0

diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml
@@ -64,6 +64,8 @@ ipam:
       service: "Readiness"
     liveness:
       service: "Liveness"
+    startup:
+      service: "Startup"
 
 nsp:
   image: nsp

diff --git a/docs/components/ipam.md b/docs/components/ipam.md
@@ -83,6 +83,7 @@ Service | Description
 --- | ---
 Liveness | A unique service to be used by liveness probe to return status, can aggregate other lesser services
 Readiness | A unique service to be used by readiness probe to return status, can aggregate other lesser services
+Startup | A unique service to be used by startup probe to return status, can aggregate other lesser services
 
 Service | Probe | Description
 --- | --- | ---

diff --git a/pkg/controllers/trench/ipam.go b/pkg/controllers/trench/ipam.go
@@ -1,5 +1,6 @@
 /*
 Copyright (c) 2021-2022 Nordix Foundation
+Copyright (c) 2024 OpenInfra Foundation Europe
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -106,15 +107,15 @@ func (i *IpamStatefulSet) insertParameters(dep *appsv1.StatefulSet) *appsv1.Stat
 			}
 			if container.StartupProbe == nil {
 				container.StartupProbe = common.GetProbe(common.StartUpTimer,
-					common.GetProbeCommand(false, "unix:///tmp/health.sock", ""))
+					common.GetProbeCommand(false, "unix:///tmp/health.sock", "Startup"))
 			}
 			if container.ReadinessProbe == nil {
 				container.ReadinessProbe = common.GetProbe(common.ReadinessTimer,
-					common.GetProbeCommand(true, fmt.Sprintf(":%d", common.IpamPort), ""))
+					common.GetProbeCommand(false, "unix:///tmp/health.sock", "Readiness"))
 			}
 			if container.LivenessProbe == nil {
 				container.LivenessProbe = common.GetProbe(common.LivenessTimer,
-					common.GetProbeCommand(false, "unix:///tmp/health.sock", ""))
+					common.GetProbeCommand(false, "unix:///tmp/health.sock", "Liveness"))
 			}
 			container.Env = i.getEnvVars(ret.Spec.Template.Spec.Containers[0].Env)
 			// set resource requirements for container (if not found, then values from model