Skip to content

[oadp-1.3] OADP-8484: Added backfill to startup probe#2326

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:oadp-1.3from
NicholasYancey:fix-startup-probe-backfill-1.3
Jul 24, 2026
Merged

[oadp-1.3] OADP-8484: Added backfill to startup probe#2326
openshift-merge-bot[bot] merged 1 commit into
openshift:oadp-1.3from
NicholasYancey:fix-startup-probe-backfill-1.3

Conversation

@NicholasYancey

Copy link
Copy Markdown
Contributor

Why the changes were made

StartupProbe was added to the CLI download server in #2317, but the upgrade-backfill logic in reconcileCLIResources was never updated to include it as it only checks ReadinessProbe == nil before patching an existing deployment. Since ReadinessProbe was already set on any deployment from before #2317, that check never fires again, so existing/upgraded clusters never get a StartupProbe backfilled onto their CLI server pod.

This PR fixes the backfill to look up the container by name and independently check/patch StartupProbe alongside readiness/liveness.

How to test the changes made

Run the unit tests covering the fix, including a regression test that reproduces the stuck state (probes already set, StartupProbe still missing):

go test ./controllers/... -run 'CLIServer|CLIResources' -v

On a live cluster, confirm the probe shows up on an existing deployment after upgrading:

oc get deploy -n openshift-adp openshift-adp-oadp-cli-server \
  -o jsonpath='{.spec.template.spec.containers[0].startupProbe}{"\n"}'

@NicholasYancey NicholasYancey self-assigned this Jul 24, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 24, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 24, 2026

Copy link
Copy Markdown

@NicholasYancey: This pull request references OADP-8484 which is a valid jira issue.

Details

In response to this:

Why the changes were made

StartupProbe was added to the CLI download server in #2317, but the upgrade-backfill logic in reconcileCLIResources was never updated to include it as it only checks ReadinessProbe == nil before patching an existing deployment. Since ReadinessProbe was already set on any deployment from before #2317, that check never fires again, so existing/upgraded clusters never get a StartupProbe backfilled onto their CLI server pod.

This PR fixes the backfill to look up the container by name and independently check/patch StartupProbe alongside readiness/liveness.

How to test the changes made

Run the unit tests covering the fix, including a regression test that reproduces the stuck state (probes already set, StartupProbe still missing):

go test ./controllers/... -run 'CLIServer|CLIResources' -v

On a live cluster, confirm the probe shows up on an existing deployment after upgrading:

oc get deploy -n openshift-adp openshift-adp-oadp-cli-server \
 -o jsonpath='{.spec.template.spec.containers[0].startupProbe}{"\n"}'

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 24ed3384-d4d4-4204-935b-cde49da6df94

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 68.42105% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 34.35%. Comparing base (d911a14) to head (d52df1d).

⚠️ Current head d52df1d differs from pull request most recent head 7694c45

Please upload reports for the commit 7694c45 to get more accurate results.

Files with missing lines Patch % Lines
controllers/cli_download_controller.go 68.42% 5 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           oadp-1.3    #2326      +/-   ##
============================================
+ Coverage     33.92%   34.35%   +0.42%     
============================================
  Files            30       30              
  Lines          4937     4949      +12     
============================================
+ Hits           1675     1700      +25     
+ Misses         3082     3063      -19     
- Partials        180      186       +6     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2026
@kaovilai

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2026
@openshift-ci

openshift-ci Bot commented Jul 24, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, NicholasYancey, sseago

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

The pull request process is described 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

@kaovilai

Copy link
Copy Markdown
Member

/retest

Flake

@openshift-ci

openshift-ci Bot commented Jul 24, 2026

Copy link
Copy Markdown

@NicholasYancey: all tests passed!

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.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 14c44e5 into openshift:oadp-1.3 Jul 24, 2026
10 checks passed
@NicholasYancey
NicholasYancey deleted the fix-startup-probe-backfill-1.3 branch July 24, 2026 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants