From 8ddc1e93cb356021474e857b4aecd2e151d41c62 Mon Sep 17 00:00:00 2001
From: Ayoub Mrini <ayoubmrini424@gmail.com>
Date: Sat, 8 Aug 2026 18:57:12 +0200
Subject: [PATCH] step-registry/tls-scanner: fix deprecated variable fallback

The split resource variables (SCANNER_CPU_REQUEST, etc.) had non-empty
defaults that shadowed the deprecated SCANNER_CPU/SCANNER_MEMORY values.
CI configs setting only the old names got the YAML defaults (4/4Gi)
instead of their intended values, causing pods to fail scheduling.

Clear the defaults so the shell fallback (${SCANNER_CPU_REQUEST:-${SCANNER_CPU}})
actually reaches the deprecated variables when the new ones aren't explicitly set.
---
 .../tls-scanner-hypershift-run-ref.yaml          | 16 ++++++++--------
 .../tls/scanner/run/tls-scanner-run-ref.yaml     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ci-operator/step-registry/tls/scanner/hypershift-run/tls-scanner-hypershift-run-ref.yaml b/ci-operator/step-registry/tls/scanner/hypershift-run/tls-scanner-hypershift-run-ref.yaml
index 095c5151eda73..8636cb08437bb 100644
--- a/ci-operator/step-registry/tls/scanner/hypershift-run/tls-scanner-hypershift-run-ref.yaml
+++ b/ci-operator/step-registry/tls/scanner/hypershift-run/tls-scanner-hypershift-run-ref.yaml
@@ -25,16 +25,16 @@ ref:
     default: "4Gi"
     documentation: "Deprecated: use SCANNER_MEM_REQUEST and SCANNER_MEM_LIMIT. Kept as fallback."
   - name: SCANNER_CPU_REQUEST
-    default: "4"
+    default: ""
     documentation: "CPU request for the scanner pod."
   - name: SCANNER_CPU_LIMIT
-    default: "4"
+    default: ""
     documentation: "CPU limit for the scanner pod."
   - name: SCANNER_MEM_REQUEST
-    default: "4Gi"
+    default: ""
     documentation: "Memory request for the scanner pod."
   - name: SCANNER_MEM_LIMIT
-    default: "4Gi"
+    default: ""
     documentation: "Memory limit for the scanner pod."
   - name: SCANNER_CPU_GUEST
     default: "1"
@@ -43,16 +43,16 @@ ref:
     default: "2Gi"
     documentation: "Deprecated: use SCANNER_MEM_GUEST_REQUEST and SCANNER_MEM_GUEST_LIMIT. Kept as fallback."
   - name: SCANNER_CPU_GUEST_REQUEST
-    default: "1"
+    default: ""
     documentation: "CPU request for the scanner pod on the guest cluster."
   - name: SCANNER_CPU_GUEST_LIMIT
-    default: "1"
+    default: ""
     documentation: "CPU limit for the scanner pod on the guest cluster."
   - name: SCANNER_MEM_GUEST_REQUEST
-    default: "2Gi"
+    default: ""
     documentation: "Memory request for the scanner pod on the guest cluster."
   - name: SCANNER_MEM_GUEST_LIMIT
-    default: "2Gi"
+    default: ""
     documentation: "Memory limit for the scanner pod on the guest cluster."
   - name: TLS_PROFILE_TYPE
     default: "Modern"
diff --git a/ci-operator/step-registry/tls/scanner/run/tls-scanner-run-ref.yaml b/ci-operator/step-registry/tls/scanner/run/tls-scanner-run-ref.yaml
index 37072ca16a889..6f34fc529552b 100644
--- a/ci-operator/step-registry/tls/scanner/run/tls-scanner-run-ref.yaml
+++ b/ci-operator/step-registry/tls/scanner/run/tls-scanner-run-ref.yaml
@@ -20,16 +20,16 @@ ref:
     default: "4Gi"
     documentation: "Deprecated: use SCANNER_MEM_REQUEST and SCANNER_MEM_LIMIT. Kept as fallback."
   - name: SCANNER_CPU_REQUEST
-    default: "4"
+    default: ""
     documentation: "CPU request for the scanner pod."
   - name: SCANNER_CPU_LIMIT
-    default: "4"
+    default: ""
     documentation: "CPU limit for the scanner pod."
   - name: SCANNER_MEM_REQUEST
-    default: "4Gi"
+    default: ""
     documentation: "Memory request for the scanner pod."
   - name: SCANNER_MEM_LIMIT
-    default: "4Gi"
+    default: ""
     documentation: "Memory limit for the scanner pod."
   - name: TLS_SCANNER_CLUSTER_LABEL
     default: ""