Skip to content

[release-4.16] OCPBUGS-63233: Manual feature backport of cert rotation for whereabouts#3040

Open
bpickard22 wants to merge 3 commits into
openshift:release-4.16from
bpickard22:4.16-whereabouts-token-watcher-backport
Open

[release-4.16] OCPBUGS-63233: Manual feature backport of cert rotation for whereabouts#3040
bpickard22 wants to merge 3 commits into
openshift:release-4.16from
bpickard22:4.16-whereabouts-token-watcher-backport

Conversation

@bpickard22

@bpickard22 bpickard22 commented Jun 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Manual backport of the whereabouts-token-watcher feature and follow-up fixes to release-4.16.

release-4.16 did not contain the token-watcher feature at all, so this required a manual backport of the feature plus accumulated fixes rather than a simple cherry-pick. Cherry-picked from 4.17 (PR #2784) and master (#2727, #2841). Future backports of follow-up fixes should be possible via the cherry-pick bot.

Equivalent to what is on release-4.17.

bpickard22 and others added 2 commits June 29, 2026 17:05
@bpickard22
Manual feature backport of cert rotation for whereabouts
d54a12c 
Includes cert check script logic and delpoyment of token watcher
daemonset in openshift-mutlus namespace to watch for token change

Signed-off-by: Benjamin Pickard <bpickard@redhat.com>
@bverschueren @bpickard22
Add release version annotation to whereabouts-controller and whereabo…
976e4b5 
…uts-token-watcher
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 29, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@bpickard22: This pull request references Jira Issue OCPBUGS-63233, 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.16.z) matches configured target version for branch (4.16.z)
  • 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-58066 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-58066 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (weliang@redhat.com), skipping review request.

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

Details

In response to this:

Summary

Manual backport of the whereabouts-token-watcher feature and follow-up fixes to release-4.16.

This PR includes:

  • Token watcher DaemonSet: Deploys a DaemonSet in the openshift-multus namespace that watches the whereabouts service account token and CA file for changes and regenerates the kubeconfig when changes are detected
  • Release version annotation: Corrects the release annotation on the token-watcher DaemonSet (release.openshift.io/version)
  • DaemonSet improvements (from PR OCPBUGS-63443: Fix whereabouts-token-watcher DaemonSet improvements #2841 by @pliurh): logging helpers, dynamic token reading, fixed CA change detection logic, 60s check interval, host CNI network directory mount, mount path typo fix

Cherry-picked from:

The resulting token-watcher DaemonSet is identical to what is on release-4.17.

Related PRs:

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 Jun 29, 2026 •
edited
Loading

Copy link
Copy Markdown

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: Enterprise

Run ID: 3697ae8d-89cf-46ac-8e99-e6ce56e95977

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.

@openshift-ci openshift-ci Bot requested review from arghosh93 and kyrtapz June 29, 2026 21:13
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bpickard22
Once this PR has been reviewed and has the lgtm label, please assign knobunc 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

@bpickard22

bpickard22 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

/jira cherrypick OCPBUGS-58066

@openshift-ci-robot

openshift-ci-robot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@bpickard22: Detected clone of Jira Issue OCPBUGS-58066 with correct target version. Will retitle the PR to link to the clone.
/retitle OCPBUGS-63233: OCPBUGS-63233: [release-4.16] Manual feature backport of cert rotation for whereabouts

Details

In response to this:

/jira cherrypick OCPBUGS-58066

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 OCPBUGS-63233: [release-4.16] Manual feature backport of cert rotation for whereabouts OCPBUGS-63233: OCPBUGS-63233: [release-4.16] Manual feature backport of cert rotation for whereabouts Jun 29, 2026
@pliurh @bpickard22
Fix: whereabouts-token-watcher DaemonSet improvements
28d9a45 
This commit introduces several improvements to the whereabouts-token-watcher DaemonSet:
- Corrects a typo in the description.
- Adds logging helper functions for better script output.
- Ensures the service account token is read dynamically during kubeconfig generation.
- Fixes the logical grouping in the CA file change detection condition.
- Increases the kubeconfig regeneration check interval to 60 seconds.
- Mounts the host's CNI network directory for proper CNI configuration management.

Signed-off-by: Peng Liu <pliu@redhat.com>
Signed-off-by: Benjamin Pickard <bpickard@redhat.com>
@bpickard22 bpickard22 force-pushed the 4.16-whereabouts-token-watcher-backport branch from a56bd74 to 28d9a45 Compare June 29, 2026 21:26
@openshift-ci-robot

openshift-ci-robot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@bpickard22: This pull request references Jira Issue OCPBUGS-63233, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.z) matches configured target version for branch (4.16.z)
  • bug is in the state POST, 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-58066 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-58066 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (weliang@redhat.com), skipping review request.

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

Details

In response to this:

Manual backport of the whereabouts-token-watcher feature and follow-up fixes to release-4.16.

Cherry-picked from master PRs #2702, #2727, #2841.

Equivalent to what is on release-4.17 (PR #2784).

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.

@bpickard22 bpickard22 changed the title OCPBUGS-63233: OCPBUGS-63233: [release-4.16] Manual feature backport of cert rotation for whereabouts [release-4.16] OCPBUGS-63233: Manual feature backport of cert rotation for whereabouts Jun 30, 2026
@bpickard22

bpickard22 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@bpickard22: 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/prow/4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade 28d9a45 link false /test 4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade
ci/prow/4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade 28d9a45 link true /test 4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
ci/prow/4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade-ipsec 28d9a45 link false /test 4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade-ipsec
ci/prow/e2e-aws-live-migration-sdn-ovn 28d9a45 link true /test e2e-aws-live-migration-sdn-ovn
ci/prow/e2e-aws-ovn-hypershift-conformance 28d9a45 link true /test e2e-aws-ovn-hypershift-conformance
ci/prow/security 28d9a45 link false /test security
ci/prow/4.16-upgrade-from-stable-4.15-e2e-azure-ovn-upgrade 28d9a45 link false /test 4.16-upgrade-from-stable-4.15-e2e-azure-ovn-upgrade

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

Reviewers

@arghosh93 arghosh93 Awaiting requested review from arghosh93
@kyrtapz kyrtapz Awaiting requested review from kyrtapz

Assignees

No one assigned

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bpickard22 @openshift-ci-robot @bverschueren @pliurh