Skip to content

[release-5.0] CNTRLPLANE-4025: feat(azure): support managed HSM for KMS encryption - #9376

Merged
openshift-merge-bot[bot] merged 6 commits into
openshift:release-5.0from
hlipsig:cherry-pick-CNTRLPLANE-4025-to-release-5.0
Aug 27, 2026
Merged

openshift-merge-bot[bot] merged 6 commits into
openshift:release-5.0from
hlipsig:cherry-pick-CNTRLPLANE-4025-to-release-5.0

Conversation

@hlipsig

@hlipsig hlipsig commented Aug 21, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Backport the complete contents of #9199 to release-5.0.

This adds Azure Managed HSM support for KMS encryption across the API, generated CRDs and clients, CLI, HyperShift Operator, Control Plane Operator, key rotation, documentation, and setup tooling.

Manual conflict resolution

Two test-only conflicts caused by release-5.0 drift were resolved by retaining the release branch context and adding the Managed HSM test coverage from the original PR:

  • support/azureutil/azureutil_test.go
  • control-plane-operator/controllers/hostedcontrolplane/v2/kas/kms_test.go

Validation

  • make run-gitlint passes.
  • Azure utility, secret encryption, KAS/KMS, re-encryption, and Azure CLI package tests pass.
  • The hostedcluster package has a pre-existing release-5.0 compile failure because generated releaseinfo mock helpers are absent.
  • make verify reaches the CRD compatibility check and reports pre-existing AWS resource-tag regex changes already present on upstream/release-5.0, including in files untouched by this backport.

References

hlipsig and others added 6 commits August 21, 2026 10:31
- Add AzureKMSKeyVaultType to AzureKMSSpec with backward-compatible immutability validation
- Support Public, US Government, China, German, and Bleu Azure clouds
- Accept Managed HSM encryption key URLs and regenerate feature-gated API manifests

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Regenerate install CRDs and validation suites for Managed HSM and sovereign clouds
- Cover immutable vault type transitions and all supported Azure key URL suffixes
- Update the AzureKMSSpec client and vendored HyperShift API types

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Propagate the detected vault type into AzureKMSSpec during cluster creation
- Expose all supported Azure cloud environments in CLI help
- Document Key Vault and Managed HSM encryption key URL formats

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Resolve Key Vault and Managed HSM endpoints across all supported Azure clouds
- Preserve legacy Key Vault fingerprints while distinguishing Managed HSM keys
- Gate Managed HSM on OpenShift 4.22 without masking release resolution failures

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Pass Managed HSM mode to both active and backup Azure KMS provider sidecars
- Use one immutable vault type for active, backup, and rotation target keys
- Preserve legacy Key Vault provider names while distinguishing Managed HSM providers

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Describe supported Azure KMS services, clouds, and minimum OpenShift version
- Regenerate the API reference and aggregated documentation

Signed-off-by: Hilliary Lipsig <hlipsig@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 21, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 21, 2026 •

Copy link
Copy Markdown

@hlipsig: This pull request references CNTRLPLANE-4025 which is a valid jira issue.

Details

In response to this:

Summary

Backport the complete contents of #9199 to release-5.0.

This adds Azure Managed HSM support for KMS encryption across the API, generated CRDs and clients, CLI, HyperShift Operator, Control Plane Operator, key rotation, documentation, and setup tooling.

Manual conflict resolution

Two test-only conflicts caused by release-5.0 drift were resolved by retaining the release branch context and adding the Managed HSM test coverage from the original PR:

  • support/azureutil/azureutil_test.go
  • control-plane-operator/controllers/hostedcontrolplane/v2/kas/kms_test.go

Validation

  • make run-gitlint passes.
  • Azure utility, secret encryption, KAS/KMS, re-encryption, and Azure CLI package tests pass.
  • The hostedcluster package has a pre-existing release-5.0 compile failure because generated releaseinfo mock helpers are absent.
  • make verify reaches the CRD compatibility check and reports pre-existing AWS resource-tag regex changes already present on upstream/release-5.0, including in files untouched by this backport.

References

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 Aug 21, 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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 449763ee-5997-466e-94b1-07c33ab09ce4

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

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.

@hlipsig

hlipsig commented Aug 21, 2026

Copy link
Copy Markdown
Contributor Author

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/azure PR/issue for Azure (AzurePlatform) platform and removed do-not-merge/needs-area labels Aug 21, 2026
@openshift-ci

openshift-ci Bot commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

@hlipsig: The label(s) backport-risk-assessed cannot be applied or removed, because you are not in one of the allowed teams and are not an allowed user. Must be a member of one of these teams: openshift-patch-managers, openshift-staff-engineers, openshift-release-oversight, openshift-sustaining-engineers

Details

In response to this:

/label backport-risk-assessed

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.

@bryan-cox bryan-cox left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/approve

@hlipsig

hlipsig commented Aug 21, 2026

Copy link
Copy Markdown
Contributor Author

/verified by @hlipsig

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

Copy link
Copy Markdown

@hlipsig: This PR has been marked as verified by @hlipsig.

Details

In response to this:

/verified by @hlipsig

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.

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

openshift-ci Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: bryan-cox, hlipsig

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

@muraee

muraee commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

/lgtm

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

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks-4-22
/test e2e-aws-4-22
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-aks-external-oidc
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws
/test e2e-v2-azure-self-managed
/test e2e-v2-gke

@hlipsig

hlipsig commented Aug 24, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD a7fbf21 and 2 for PR HEAD 4769a25 in total

@csrwng csrwng added 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. labels Aug 24, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 07a7273 and 1 for PR HEAD 4769a25 in total

@bryan-cox

Copy link
Copy Markdown
Member

/retest

2 similar comments
@hlipsig

hlipsig commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@bryan-cox

Copy link
Copy Markdown
Member

/retest

@bryan-cox

Copy link
Copy Markdown
Member

/test e2e-kubevirt-aws-ovn-reduced

@bryan-cox

Copy link
Copy Markdown
Member

/override "e2e-kubevirt-aws-ovn-reduced"

@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@bryan-cox: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • e2e-kubevirt-aws-ovn-reduced

Only the following failed contexts/checkruns were expected:

  • CodeRabbit
  • ci/prow/e2e-aks
  • ci/prow/e2e-aks-4-22
  • ci/prow/e2e-aws
  • ci/prow/e2e-aws-4-22
  • ci/prow/e2e-aws-upgrade-hypershift-operator
  • ci/prow/e2e-azure-aks-external-oidc
  • ci/prow/e2e-kubevirt-aws-ovn-reduced
  • ci/prow/e2e-v2-aws
  • ci/prow/e2e-v2-azure-self-managed
  • ci/prow/e2e-v2-gke
  • ci/prow/images
  • ci/prow/security
  • ci/prow/unit
  • ci/prow/verify
  • ci/prow/verify-deps
  • pull-ci-openshift-hypershift-main-e2e-aks
  • pull-ci-openshift-hypershift-main-e2e-aws
  • pull-ci-openshift-hypershift-main-e2e-aws-upgrade-hypershift-operator
  • pull-ci-openshift-hypershift-main-e2e-kubevirt-aws-ovn-reduced
  • pull-ci-openshift-hypershift-main-e2e-v2-aws
  • pull-ci-openshift-hypershift-main-e2e-v2-azure-self-managed
  • pull-ci-openshift-hypershift-main-e2e-v2-gke
  • pull-ci-openshift-hypershift-main-images
  • pull-ci-openshift-hypershift-main-security
  • pull-ci-openshift-hypershift-main-unit
  • pull-ci-openshift-hypershift-main-verify
  • pull-ci-openshift-hypershift-main-verify-deps
  • pull-ci-openshift-hypershift-release-4.20-e2e-azure-aks-external-oidc
  • pull-ci-openshift-hypershift-release-4.23-e2e-aks-4-22
  • pull-ci-openshift-hypershift-release-4.23-e2e-aws-4-22
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override "e2e-kubevirt-aws-ovn-reduced"

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.

@bryan-cox

Copy link
Copy Markdown
Member

/override "ci/prow/e2e-kubevirt-aws-ovn-reduced"

@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-kubevirt-aws-ovn-reduced

Details

In response to this:

/override "ci/prow/e2e-kubevirt-aws-ovn-reduced"

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.

@bryan-cox

Copy link
Copy Markdown
Member

/override "ci/prow/e2e-kubevirt-aws-ovn-reduced"

@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-kubevirt-aws-ovn-reduced

Details

In response to this:

/override "ci/prow/e2e-kubevirt-aws-ovn-reduced"

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

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@hlipsig: The following test 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/e2e-kubevirt-aws-ovn-reduced 4769a25 link true /test e2e-kubevirt-aws-ovn-reduced

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 c94b15c into openshift:release-5.0 Aug 27, 2026
21 checks passed
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. area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/azure PR/issue for Azure (AzurePlatform) platform 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.

6 participants