Skip to content

[occm] Include cloudConfigContents in DaemonSet checksum annotation - #3080

Merged
kubernetes-prow[bot] merged 2 commits into
kubernetes:masterfrom
234u34k:fix/occm-checksum-cloudconfigcontents
Jul 25, 2026
Merged

[occm] Include cloudConfigContents in DaemonSet checksum annotation#3080
kubernetes-prow[bot] merged 2 commits into
kubernetes:masterfrom
234u34k:fix/occm-checksum-cloudconfigcontents

Conversation

@234u34k

@234u34k 234u34k commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

The DaemonSet checksum annotation only hashes the output of the cloudConfig template helper. When cloud config is supplied via cloudConfigContents, changes to it do not trigger pod restarts. Credential rotations and endpoint changes go undetected.

Include cloudConfigContents in the checksum input.

Ref #3030

occm: Fix DaemonSet checksum annotation to include cloudConfigContents so that config changes trigger pod restarts.

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 1, 2026
@linux-foundation-easycla

linux-foundation-easycla Bot commented Mar 1, 2026

Copy link
Copy Markdown

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: 234u34k / name: 234u34k (6c98256)

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

@k8s-ci-robot
k8s-ci-robot requested review from dulek and stephenfin March 1, 2026 16:49
@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 1, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @234u34k. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 1, 2026
@234u34k
234u34k force-pushed the fix/occm-checksum-cloudconfigcontents branch from c1a5df2 to 6c98256 Compare March 1, 2026 18:36
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Mar 1, 2026
@k8s-triage-robot

Copy link
Copy Markdown

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label May 30, 2026
@k8s-triage-robot

Copy link
Copy Markdown

The Kubernetes project currently lacks enough active contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle rotten
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

@kubernetes-prow kubernetes-prow Bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Jun 29, 2026
@jihyun-huh

Copy link
Copy Markdown

/remove-lifecycle rotten

Hi, thanks for fixing this.
The issue looks valid to me and my team,
actually the Secret template prefers cloudConfigContents when it is initially set, but the DaemonSet checksum currently only hashes the cloudconfig, so update to credentials or endpoints in cloudconfig contents seems do not trigger a rollout.

This change should fix that behaviour and looks safe to merge.

if it is okay, would you kindly add ok-to-test on this PR?
cc. @gouthampacha @stephenfin @kayrus

@kubernetes-prow kubernetes-prow Bot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Jul 13, 2026
@gouthampacha

Copy link
Copy Markdown
Contributor

/ok-to-test

@kubernetes-prow kubernetes-prow Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 13, 2026
@gouthampacha

Copy link
Copy Markdown
Contributor

/lgtm

thank you @jihyun-huh

@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 13, 2026
@kayrus

kayrus commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

@jihyun-huh could you bump a corresponding chart version?

@jihyun-huh

Copy link
Copy Markdown

@kayrus
Hi, that makes sense, and noticed that this PR #3039 already bumps the chart version to 2.36.1, so whichever PR merges second will probably just need a small rebase and bump to 2.36.2.

So if you get a chance,, I would really really appreciate another look at #3039 since it's been waiting for review for a while. 🥺

@234u34k

234u34k commented Jul 14, 2026

Copy link
Copy Markdown
Contributor Author

Thanks folks, please let me know if this PR is lacking anything that I can provide

@jihyun-huh

Copy link
Copy Markdown

Hi, @kayrus i misunderstood, and yes, the corresponding chart version should be bumped as part of this PR.
i'm not the author of this PR, so @234u34k , could you update Chart.yaml?

the master version is 2.36.0

@kubernetes-prow kubernetes-prow Bot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 22, 2026
234u34k added 2 commits July 21, 2026 22:13
When cloud config is supplied via cloudConfigContents rather than the
structured cloudConfig values, changes to it do not alter the checksum
annotation on the DaemonSet pod template. Pods are not restarted after
credential rotation or endpoint changes.
@234u34k
234u34k force-pushed the fix/occm-checksum-cloudconfigcontents branch from bbdfa77 to 6d4a519 Compare July 22, 2026 05:22
@234u34k

234u34k commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

/test pull-cloud-provider-openstack-check

@234u34k

234u34k commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Chart version bump and rebase are complete, and CI is green. @gouthampacha could you please restore /lgtm? @zetaab could you review for approval afterward? Thanks.

@gouthampacha

Copy link
Copy Markdown
Contributor

/lgtm

@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2026
@kayrus

kayrus commented Jul 25, 2026

Copy link
Copy Markdown
Contributor

/approve

@kubernetes-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kayrus

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

@kubernetes-prow kubernetes-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 25, 2026
@kubernetes-prow
kubernetes-prow Bot merged commit 231a42c into kubernetes:master Jul 25, 2026
5 checks passed
@234u34k

234u34k commented Jul 25, 2026

Copy link
Copy Markdown
Contributor Author

Thanks all

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants