ROX-28735: use service instead of pod (#16649)

janisz · ksurabhi91 · commit fdca7a905d0e · 2025-09-05T14:56:53.000-07:00
Signed-off-by: Tomasz Janiszewski &lt;tomek@redhat.com&gt;
diff --git a/scripts/ci/create-webhookserver.sh b/scripts/ci/create-webhookserver.sh
@@ -33,24 +33,16 @@ create_webhook_server_port_forward() {
     # Ensure webhookserver state is stable before continuing with port forward.
     kubectl rollout status deployment webhookserver --namespace stackrox --timeout=5m --watch=true
 
-    local pod
-    pod="$(kubectl -n stackrox get pod -l app=webhookserver -o name)"
-    echo "Got pod ${pod}"
-    [[ -n "${pod}" ]]
-
-    kubectl -n stackrox wait --for=condition=ready "${pod}" --timeout=5m
     local log="${ARTIFACT_DIR:-/tmp}/webhook_server_port_forward.log"
     nohup "${BASH_SOURCE[0]}" restart_webhook_server_port_forward "${pod}" 0<&- &> "${log}" &
     sleep 1
 }
 
 restart_webhook_server_port_forward() {
-    local pod="$1"
-
     while true
     do
-        echo "INFO: $(date): Starting webhook server port-forward: ${pod} 8080"
-        kubectl -n stackrox port-forward "${pod}" 8080:8080 || {
+        echo "INFO: $(date): Starting webhook server port-forward: svc/webhookserver 8080"
+        kubectl -n stackrox port-forward svc/webhookserver 8080:8080 -v=6 || {
             echo "WARNING: $(date): The webhook server port-forward exited with: $?"
             echo "Will restart in 5 seconds..."
             sleep 5
diff --git a/webhookserver/chart/templates/server.yaml b/webhookserver/chart/templates/server.yaml
@@ -39,6 +39,22 @@ spec:
           capabilities:
             drop: ["NET_RAW"]
           readOnlyRootFilesystem: true
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8080
+          initialDelaySeconds: 10
+          periodSeconds: 30
+          timeoutSeconds: 5
+          failureThreshold: 3
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 2
       volumes:
       - name: certs
         secret:
