refactor: unify registry port configuration and enforce positive duration constraints for registry TTL and health intervals

Signed-off-by: Ankit Kr. Chowdhury <rakesh856100@gmail.com>

Author: gitcommitankit

charts/agentrax/templates/deployment.yaml

@@ -45,7 +45,7 @@ spec:
             {{- if hasKey .Values.manager "metricsSecure" }}
             - --metrics-secure={{ .Values.manager.metricsSecure }}
             {{- end }}
-            - --registry-bind-address={{ .Values.registry.bindAddress | default ":9090" }}
+            - --registry-bind-address=:{{ .Values.registry.bindPort | default 9090 }}
             - --gpu-resource-name={{ .Values.manager.gpuResourceName | default "nvidia.com/gpu" }}
             {{- if .Values.prometheus.url }}
             - --prometheus-url={{ .Values.prometheus.url }}
@@ -76,6 +76,11 @@ spec:
             - name: health
               containerPort: {{ .Values.manager.healthProbeBindPort | default 8081 }}
               protocol: TCP
+            {{- if and .Values.manager.metricsBindAddress (ne .Values.manager.metricsBindAddress "0") }}
+            - name: {{ if eq (toString .Values.manager.metricsSecure) "false" }}http{{ else }}https{{ end }}
+              containerPort: {{ if eq .Values.manager.metricsBindAddress ":8080" }}8080{{ else if eq .Values.manager.metricsBindAddress ":8443" }}8443{{ else if eq (toString .Values.manager.metricsSecure) "false" }}8080{{ else }}8443{{ end }}
+              protocol: TCP
+            {{- end }}
           livenessProbe:
             httpGet:
               path: /healthz

charts/agentrax/templates/metrics-service.yaml

@@ -11,8 +11,8 @@ spec:
   selector:
     {{- include "agentrax.selectorLabels" . | nindent 4 }}
   ports:
-    - name: https
-      port: 8443
-      targetPort: 8443
+    - name: {{ if eq (toString .Values.manager.metricsSecure) "false" }}http{{ else }}https{{ end }}
+      port: {{ if eq .Values.manager.metricsBindAddress ":8080" }}8080{{ else if eq .Values.manager.metricsBindAddress ":8443" }}8443{{ else if eq (toString .Values.manager.metricsSecure) "false" }}8080{{ else }}8443{{ end }}
+      targetPort: {{ if eq .Values.manager.metricsBindAddress ":8080" }}8080{{ else if eq .Values.manager.metricsBindAddress ":8443" }}8443{{ else if eq (toString .Values.manager.metricsSecure) "false" }}8080{{ else }}8443{{ end }}
       protocol: TCP
 {{- end }}

charts/agentrax/values.yaml

@@ -94,9 +94,7 @@ registry:
     port: 9090
     # -- Registry Service type
     type: ClusterIP
-  # -- Bind address for the in-operator registry HTTP server
-  bindAddress: ":9090"
-  # -- Bind port for the registry HTTP server (referenced by container port and targetPort).
+  # -- Bind port for the registry HTTP server (used for container port, service targetPort, and manager bind address).
   bindPort: 9090
   # -- Registry entry TTL (e.g. "90s")
   ttl: "90s"

cmd/main.go

@@ -219,28 +219,34 @@ func main() {
 
 	registryTTL := registry.DefaultTTL
 	if v := os.Getenv("AGENTRAX_REGISTRY_TTL"); v != "" {
-		if parsed, err := time.ParseDuration(v); err == nil {
+		if parsed, err := time.ParseDuration(v); err == nil && parsed > 0 {
 			registryTTL = parsed
 		} else {
-			setupLog.Error(err, "invalid AGENTRAX_REGISTRY_TTL, using default", "default", registry.DefaultTTL)
+			setupLog.Error(err, "invalid or non-positive AGENTRAX_REGISTRY_TTL, using default",
+				"default", registry.DefaultTTL)
 		}
 	}
 
 	mcpHealthInterval := 60 * time.Second
 	if v := os.Getenv("AGENTRAX_MCP_HEALTH_INTERVAL"); v != "" {
-		if parsed, err := time.ParseDuration(v); err == nil {
+		if parsed, err := time.ParseDuration(v); err == nil && parsed > 0 {
 			mcpHealthInterval = parsed
 		} else {
-			setupLog.Error(err, "invalid AGENTRAX_MCP_HEALTH_INTERVAL, using default", "default", mcpHealthInterval)
+			setupLog.Error(err, "invalid or non-positive AGENTRAX_MCP_HEALTH_INTERVAL, using default",
+				"default", mcpHealthInterval)
 		}
 	}
 
 	if mcpHealthInterval >= registryTTL {
+		adjusted := registryTTL / 2
+		if adjusted <= 0 {
+			adjusted = time.Second
+		}
 		setupLog.Info("AGENTRAX_MCP_HEALTH_INTERVAL must be strictly less than AGENTRAX_REGISTRY_TTL",
 			"configuredInterval", mcpHealthInterval,
 			"registryTTL", registryTTL,
-			"adjustedInterval", registryTTL/2)
-		mcpHealthInterval = registryTTL / 2
+			"adjustedInterval", adjusted)
+		mcpHealthInterval = adjusted
 	}
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{