Skip to content

OCPBUGS-86248: fix: TLS client cert rotation when no CA is configured#313

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
machine424:rrt-rot-4.22
May 21, 2026
Merged

OCPBUGS-86248: fix: TLS client cert rotation when no CA is configured#313
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
machine424:rrt-rot-4.22

Conversation

@machine424
Copy link
Copy Markdown

Make sure it doesn't panic AND doesn't perma-fail.

Point prometheus/common to a patched version that
contains prometheus/common#908

Add TestClientTLSCertRotationWithoutCAFile (backported from prometheus#18727) to verify the fix end-to-end.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 20, 2026

Important

Review skipped

Auto reviews are disabled on this repository. 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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a4ba21d5-b77c-4f13-a938-ed95839a4e1a

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

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

@openshift-ci openshift-ci Bot requested review from marioferh and rexagod May 20, 2026 10:44
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2026
@machine424
Copy link
Copy Markdown
Author

--- BEFORE FIX (unpatched prometheus/common v0.67.4) ---

=== RUN   TestClientTLSCertRotationWithoutCAFile
=== PAUSE TestClientTLSCertRotationWithoutCAFile
=== CONT  TestClientTLSCertRotationWithoutCAFile
    reload_test.go:194: time=2026-05-20T11:23:08.492+02:00 level=INFO source=main.go:1596 msg="updated GOGC" old=100 new=75
    reload_test.go:194: time=2026-05-20T11:23:08.493+02:00 level=INFO source=main.go:708 msg="Leaving GOMAXPROCS=12: CPU quota undefined" component=automaxprocs
    reload_test.go:194: time=2026-05-20T11:23:08.493+02:00 level=INFO source=memlimit.go:198 msg="GOMEMLIMIT is updated" component=automemlimit package=github.com/KimMachineGun/automemlimit/memlimit GOMEMLIMIT=30923764531 previous=9223372036854775807
    reload_test.go:194: time=2026-05-20T11:23:08.493+02:00 level=INFO source=main.go:756 msg="No time or size retention was set so using the default time retention" duration=15d
    reload_test.go:194: time=2026-05-20T11:23:08.493+02:00 level=INFO source=main.go:810 msg="Starting Prometheus Server" mode=server version="(version=, branch=, revision=unknown)"
    reload_test.go:194: time=2026-05-20T11:23:08.493+02:00 level=INFO source=main.go:815 msg="operational information" build_context="(go=go1.25.0, platform=darwin/arm64, user=, date=, tags=builtinassets)" host_details=(darwin) fd_limits="(soft=122880, hard=unlimited)" vm_limits="(soft=unlimited, hard=unlimited)"
    reload_test.go:194: time=2026-05-20T11:23:08.494+02:00 level=INFO source=web.go:684 msg="Start listening for connections" component=web address=0.0.0.0:60773
    reload_test.go:194: time=2026-05-20T11:23:08.495+02:00 level=INFO source=main.go:1338 msg="Starting TSDB ..."
    reload_test.go:194: time=2026-05-20T11:23:08.496+02:00 level=INFO source=tls_config.go:354 msg="Listening on" component=web address=[::]:60773
    reload_test.go:194: time=2026-05-20T11:23:08.496+02:00 level=INFO source=tls_config.go:357 msg="TLS is disabled." component=web http2=false address=[::]:60773
    reload_test.go:194: time=2026-05-20T11:23:08.498+02:00 level=INFO source=head.go:681 msg="Replaying on-disk memory mappable chunks if any" component=tsdb
    reload_test.go:194: time=2026-05-20T11:23:08.498+02:00 level=INFO source=head.go:767 msg="On-disk memory mappable chunks replay completed" component=tsdb duration=12.458µs
    reload_test.go:194: time=2026-05-20T11:23:08.498+02:00 level=INFO source=head.go:775 msg="Replaying WAL, this may take a while" component=tsdb
    reload_test.go:194: time=2026-05-20T11:23:08.498+02:00 level=INFO source=head.go:848 msg="WAL segment loaded" component=tsdb segment=0 maxSegment=0 duration=295.875µs
    reload_test.go:194: time=2026-05-20T11:23:08.498+02:00 level=INFO source=head.go:885 msg="WAL replay completed" component=tsdb checkpoint_replay_duration=112.375µs wal_replay_duration=324.583µs wbl_replay_duration=42ns chunk_snapshot_load_duration=0s mmap_chunk_replay_duration=12.458µs total_replay_duration=461.75µs
    reload_test.go:194: time=2026-05-20T11:23:08.500+02:00 level=INFO source=main.go:1359 msg="filesystem information" fs_type=1a
    reload_test.go:194: time=2026-05-20T11:23:08.500+02:00 level=INFO source=main.go:1362 msg="TSDB started"
    reload_test.go:194: time=2026-05-20T11:23:08.500+02:00 level=INFO source=main.go:1549 msg="Loading configuration file" filename=/var/folders/pl/4zxvwhbd0q5bkw9vxnk08swm0000gn/T/TestClientTLSCertRotationWithoutCAFile2279772412/001/prometheus.yml
    reload_test.go:194: time=2026-05-20T11:23:08.503+02:00 level=INFO source=main.go:1589 msg="Completed loading of configuration file" db_storage=750ns remote_storage=709ns web_handler=292ns query_engine=458ns scrape=3.457209ms scrape_sd=19.458µs notify=625ns notify_sd=417ns rules=1.041µs tracing=17.459µs filename=/var/folders/pl/4zxvwhbd0q5bkw9vxnk08swm0000gn/T/TestClientTLSCertRotationWithoutCAFile2279772412/001/prometheus.yml totalDuration=3.82425ms
    reload_test.go:194: time=2026-05-20T11:23:08.503+02:00 level=INFO source=main.go:1323 msg="Server is ready to receive web requests."
    reload_test.go:194: time=2026-05-20T11:23:08.504+02:00 level=INFO source=manager.go:202 msg="Starting rule manager..." component="rule manager"
    main_test.go:1154: 
        	Error Trace:	$PROMETHEUS_ROOT/cmd/prometheus/main_test.go:1154
        	Error:      	Condition never satisfied
        	Test:       	TestClientTLSCertRotationWithoutCAFile
        	Messages:   	scrape should keep working after cert rotation
--- FAIL: TestClientTLSCertRotationWithoutCAFile (11.03s)
FAIL
FAIL	github.com/prometheus/prometheus/cmd/prometheus	12.980s
FAIL

Make sure it doesn't panic AND doesn't perma-fail.

Point prometheus/common to a patched version that
contains prometheus/common#908

Add TestClientTLSCertRotationWithoutCAFile (backported from
prometheus#18727) to verify the fix end-to-end.
@machine424
Copy link
Copy Markdown
Author

/jira cherrypick OCPBUGS-62118

@openshift-ci-robot
Copy link
Copy Markdown

@machine424: Jira Issue OCPBUGS-62118 has been cloned as Jira Issue OCPBUGS-86248. Will retitle bug to link to clone.
/retitle OCPBUGS-86248: fix: TLS client cert rotation when no CA is configured

Details

In response to this:

/jira cherrypick OCPBUGS-62118

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.

@openshift-ci openshift-ci Bot changed the title fix: TLS client cert rotation when no CA is configured OCPBUGS-86248: fix: TLS client cert rotation when no CA is configured May 20, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@machine424: This pull request references Jira Issue OCPBUGS-86248, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-62118 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Make sure it doesn't panic AND doesn't perma-fail.

Point prometheus/common to a patched version that
contains prometheus/common#908

Add TestClientTLSCertRotationWithoutCAFile (backported from prometheus#18727) to verify the fix end-to-end.

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.

@machine424
Copy link
Copy Markdown
Author

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@machine424: This pull request references Jira Issue OCPBUGS-86248, which is invalid:

  • expected dependent Jira Issue OCPBUGS-62118 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

@machine424
Copy link
Copy Markdown
Author

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 20, 2026
@machine424
Copy link
Copy Markdown
Author

/verified by added test

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@machine424: This PR has been marked as verified by added test.

Details

In response to this:

/verified by added test

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.

@danielmellado
Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, machine424

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:
  • OWNERS [danielmellado,machine424]

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

@machine424
Copy link
Copy Markdown
Author

/retest-required

1 similar comment
@machine424
Copy link
Copy Markdown
Author

/retest-required

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 20, 2026

@machine424: 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.

@simonpasquier
Copy link
Copy Markdown

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@simonpasquier: This pull request references Jira Issue OCPBUGS-86248, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-62118 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-62118 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

/jira refresh

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 6e5d1ae into openshift:release-4.22 May 21, 2026
11 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@machine424: Jira Issue Verification Checks: Jira Issue OCPBUGS-86248
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-86248 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Make sure it doesn't panic AND doesn't perma-fail.

Point prometheus/common to a patched version that
contains prometheus/common#908

Add TestClientTLSCertRotationWithoutCAFile (backported from prometheus#18727) to verify the fix end-to-end.

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants