Skip to content

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

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:release-4.16from
bpickard22:4.16-whereabouts-token-watcher-backport
Aug 12, 2026
Merged

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

Conversation

@bpickard22

@bpickard22 bpickard22 commented Jun 29, 2026

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
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>
@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

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

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: c5a7b8c5-5fc3-43fe-b685-06695d1627f1

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
@bpickard22

Copy link
Copy Markdown
Contributor Author

/jira cherrypick OCPBUGS-58066

@openshift-ci-robot

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
@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

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

Copy link
Copy Markdown
Contributor Author

/retest

@bpickard22

Copy link
Copy Markdown
Contributor Author

/retest-required

@weliang1

weliang1 commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

/verified by @weliang

@bpickard22

Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@bpickard22

Copy link
Copy Markdown
Contributor Author

/retest

@weliang1

weliang1 commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

/verified by @weliang

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 4, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@weliang1: This PR has been marked as verified by @weliang.

Details

In response to this:

/verified by @weliang

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.

"bootstrapKubeconfig": "{{ .KubeletKubeconfigPath }}",
"certDir": "/etc/cni/multus/certs",
"certDuration": "24h"
},

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this removed? isn't it wrong? You end up with:

      "perNodeCertificate": {
          "enabled": true,
          "bootstrapKubeconfig": "{{ .KubeletKubeconfigPath }}",
          "certDir": "/etc/cni/multus/certs",
          "certDuration": "24h"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep thats broken :(
Dont know how i missed that, good catch. We need to fix this in 4.17 as well

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>
@kyrtapz

kyrtapz commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/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 Aug 6, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test 4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
/test e2e-aws-live-migration-sdn-ovn
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-network-migration
/test e2e-aws-ovn-serial
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-upgrade-ipsec
/test e2e-aws-ovn-windows
/test e2e-azure-ovn-upgrade
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bpickard22, kyrtapz

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

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

weliang1 commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

/verified by @weliang

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 6, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@weliang1: This PR has been marked as verified by @weliang.

Details

In response to this:

/verified by @weliang

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

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 880e601 and 2 for PR HEAD fab434c in total

@bpickard22

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Aug 7, 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-azure-ovn-upgrade 28d9a45 link false /test 4.16-upgrade-from-stable-4.15-e2e-azure-ovn-upgrade
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/security fab434c link false /test security

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.

@kyrtapz

kyrtapz commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

/override ci/prow/e2e-aws-live-migration-sdn-ovn

@openshift-ci

openshift-ci Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-aws-live-migration-sdn-ovn

Details

In response to this:

/override ci/prow/e2e-aws-live-migration-sdn-ovn

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.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 869ac0a into openshift:release-4.16 Aug 12, 2026
19 of 20 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@bpickard22: Jira Issue Verification Checks: Jira Issue OCPBUGS-63233
✔️ 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-63233 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:

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.

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

Copy link
Copy Markdown
Contributor Author

/cherry-pick openshift:release-4.15

@openshift-cherrypick-robot

Copy link
Copy Markdown

@bpickard22: cannot checkout openshift:release-4.15: error checking out "openshift:release-4.15": exit status 1 error: pathspec 'openshift:release-4.15' did not match any file(s) known to git

Details

In response to this:

/cherry-pick openshift:release-4.15

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.

@bpickard22

Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

Copy link
Copy Markdown

@bpickard22: new pull request created: #3122

Details

In response to this:

/cherry-pick release-4.15

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.

@openshift-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.16.0-0.nightly-2026-08-14-004548

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.

8 participants