Skip to content

step-registry/tls-scanner: fix deprecated variable fallback - #83145

Open
machine424 wants to merge 1 commit into
openshift:mainfrom
machine424:fix-envs
Open

step-registry/tls-scanner: fix deprecated variable fallback#83145
machine424 wants to merge 1 commit into
openshift:mainfrom
machine424:fix-envs

Conversation

@machine424

@machine424 machine424 commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

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.

follow up of #82865

Summary by CodeRabbit

Updated TLS scanner CI configurations for standard and HyperShift runs. Split resource variables now default to empty values, so configurations that use deprecated SCANNER_CPU and SCANNER_MEMORY variables correctly trigger fallback behavior instead of receiving unintended 4 CPU and 4 GiB defaults. This reduces pod scheduling failures in affected CI jobs.

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.
@openshift-ci
openshift-ci Bot requested review from rhmdnd and richardsonnick August 8, 2026 16:58
@openshift-ci

openshift-ci Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: machine424
Once this PR has been reviewed and has the lgtm label, please assign rhmdnd for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

TLS scanner resource request and limit environment defaults now use empty strings for management, guest, and standard scanner runs. Existing documentation and fallback variables remain unchanged.

Changes

TLS scanner resource defaults

Layer / File(s) Summary
Clear scanner resource defaults
ci-operator/step-registry/tls/scanner/...
Management, guest, and standard scanner CPU and memory request/limit defaults changed from fixed values to empty strings.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The commit changes only two YAML reference files; added lines contain empty defaults and no Ginkgo test titles or dynamic test-name values.
Test Structure And Quality ✅ Passed The diff changes only two YAML environment defaults. It adds no Ginkgo tests, cluster operations, waits, or assertions, so this test-quality check is not applicable.
Microshift Test Compatibility ✅ Passed The commit changes only two scanner YAML files; it adds no Ginkgo tests or test code, so MicroShift API compatibility checks do not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request changes only two scanner YAML environment defaults; it adds no Ginkgo e2e tests or multi-node test assumptions.
Topology-Aware Scheduling Compatibility ✅ Passed The patch only clears scanner CPU/memory environment defaults; it adds no affinity, topology spread, node selector, toleration, replica, or PDB scheduling constraint.
Ote Binary Stdout Contract ✅ Passed The commit changes only two YAML resource defaults; it adds no OTE binary, main, suite setup, or process-level stdout writes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The commit changes only two YAML step references; it adds no Ginkgo e2e tests, IPv4 assumptions, or external connectivity requirements.
No-Weak-Crypto ✅ Passed The commit changes only scanner resource-default YAML entries; searches found no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret-token comparisons.
Container-Privileges ✅ Passed The PR changes only scanner resource defaults. The parent-to-HEAD diff adds no privilege settings; existing hostNetwork/hostPID and privileged root mode are unchanged and documented for host scans.
No-Sensitive-Data-In-Logs ✅ Passed The patch changes only CPU and memory defaults in two YAML references; it adds no logging statements or sensitive-data fields.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the tls-scanner component and the fix for deprecated variable fallback behavior.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@machine424: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-insights-runtime-extractor-main-tls-scanner openshift/insights-runtime-extractor presubmit Registry content changed
pull-ci-openshift-insights-runtime-extractor-release-5.1-tls-scanner openshift/insights-runtime-extractor presubmit Registry content changed
pull-ci-openshift-insights-runtime-extractor-release-5.0-tls-scanner openshift/insights-runtime-extractor presubmit Registry content changed
pull-ci-openshift-insights-runtime-extractor-release-4.23-tls-scanner openshift/insights-runtime-extractor presubmit Registry content changed
pull-ci-openshift-insights-runtime-extractor-release-4.22-tls-scanner openshift/insights-runtime-extractor presubmit Registry content changed
pull-ci-openshift-cluster-storage-operator-main-tls-scanner-vsphere-problem-detector openshift/cluster-storage-operator presubmit Registry content changed
pull-ci-openshift-cluster-storage-operator-release-5.1-tls-scanner-vsphere-problem-detector openshift/cluster-storage-operator presubmit Registry content changed
pull-ci-openshift-cluster-storage-operator-release-5.0-tls-scanner-vsphere-problem-detector openshift/cluster-storage-operator presubmit Registry content changed
pull-ci-openshift-cluster-storage-operator-release-4.23-tls-scanner-vsphere-problem-detector openshift/cluster-storage-operator presubmit Registry content changed
pull-ci-openshift-custom-metrics-autoscaler-operator-main-cma-e2e-aws-ovn openshift/custom-metrics-autoscaler-operator presubmit Registry content changed
pull-ci-openshift-custom-metrics-autoscaler-operator-release-5.1-cma-e2e-aws-ovn openshift/custom-metrics-autoscaler-operator presubmit Registry content changed
pull-ci-openshift-custom-metrics-autoscaler-operator-release-5.0-cma-e2e-aws-ovn openshift/custom-metrics-autoscaler-operator presubmit Registry content changed
pull-ci-openshift-custom-metrics-autoscaler-operator-release-4.23-cma-e2e-aws-ovn openshift/custom-metrics-autoscaler-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-main-tls-scanner-default-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-main-tls-scanner-modern-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-5.1-tls-scanner-default-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-5.1-tls-scanner-modern-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-5.0-tls-scanner-default-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-5.0-tls-scanner-modern-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-4.23-tls-scanner-default-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-4.23-tls-scanner-modern-profile openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-cluster-version-operator-release-4.22-tls-scanner openshift/cluster-version-operator presubmit Registry content changed
pull-ci-openshift-local-storage-operator-main-tls-scanner-local-storage openshift/local-storage-operator presubmit Registry content changed
pull-ci-openshift-local-storage-operator-release-5.1-tls-scanner-local-storage openshift/local-storage-operator presubmit Registry content changed
pull-ci-openshift-local-storage-operator-release-5.0-tls-scanner-local-storage openshift/local-storage-operator presubmit Registry content changed

A total of 120 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@machine424

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-cluster-autoscaler-operator-main-e2e-aws pull-ci-openshift-ptp-operator-main-e2e-aws pull-ci-openshift-cluster-storage-operator-main-tls-scanner-vsphere-problem-detector

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@machine424: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@machine424: job(s): pull-ci-openshift-ptp-operator-main-e2e-aws either don't exist or were not found to be affected, and cannot be rehearsed

@machine424

Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-tls-scanner-main-periodic-tls13-adherence periodic-ci-openshift-tls-scanner-main-periodic-default-tls periodic-ci-openshift-tls-scanner-main-periodic-pqc-readiness

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@machine424: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@machine424

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-vertical-pod-autoscaler-operator-main-e2e-aws-olm pull-ci-openshift-custom-metrics-autoscaler-operator-main-cma-e2e-aws-ovn pull-ci-openshift-cluster-autoscaler-operator-main-e2e-aws pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-olm

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@machine424: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@machine424

Copy link
Copy Markdown
Contributor Author

/retest

@machine424

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-custom-metrics-autoscaler-operator-main-cma-e2e-aws-ovn

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@machine424: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci

openshift-ci Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

@machine424: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-openshift-tls-scanner-main-periodic-tls13-adherence 8ddc1e9 link unknown /pj-rehearse periodic-ci-openshift-tls-scanner-main-periodic-tls13-adherence
ci/rehearse/openshift/custom-metrics-autoscaler-operator/main/cma-e2e-aws-ovn 8ddc1e9 link unknown /pj-rehearse pull-ci-openshift-custom-metrics-autoscaler-operator-main-cma-e2e-aws-ovn
ci/rehearse/periodic-ci-openshift-tls-scanner-main-periodic-pqc-readiness 8ddc1e9 link unknown /pj-rehearse periodic-ci-openshift-tls-scanner-main-periodic-pqc-readiness

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant