Skip to content

Conversation

@mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Nov 6, 2025

Started by @subhtk in #72130. See that PR for dev, QE, and peer review.

Issue: OCPBUG-26050

Link to docs preview: Preview

QE review:

  • QE has approved this change.

Additional information:

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 6, 2025

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2025
@mburke5678 mburke5678 force-pushed the node-encryption-azure branch from 54523fd to 47f9188 Compare November 19, 2025 21:57
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2025
[id="enabling-disk-encrytpion-additional-resources"]
== Additional resources

* link:https://learn.microsoft.com/en-us/azure/virtual-machines/disks-enable-host-based-encryption-portal?tabs=azure-cli#prerequisites[Use the {azure-short} portal to enable end-to-end encryption using encryption at host] ({azure-full} documentation)
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] AsciiDocDITA.RelatedLinks: Content other than links cannot be mapped to DITA related-links.

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 20, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 20, 2025

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

@mburke5678 mburke5678 merged commit 3bd72ee into openshift:main Dec 18, 2025
2 checks passed
@mburke5678 mburke5678 deleted the node-encryption-azure branch December 18, 2025 18:36
@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.12

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.13

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.14

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.15

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.16

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.17

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.18

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.19

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.20

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.12":

Applying: Added a section for day2 operator for azure disk encryption sets.
.git/rebase-apply/patch:74: trailing whitespace.
The {product-title} installation program can use an existing Disk Encryption Set with a user-managed key. To enable this feature, create a `DiskEncryptionSet` in Azure and provide the key to the installation program. 
.git/rebase-apply/patch:89: trailing whitespace.
. Evacuate the pods from the compute node. There are several ways to do this. For example, you can evacuate all the pods or the selected pods on a node: 
.git/rebase-apply/patch:98: trailing whitespace.
For other options to evacuate pods from a node, see the "Understanding how to evacuate pods on nodes" section. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Added a section for day2 operator for azure disk encryption sets.

Details

In response to this:

/cherrypick enterprise-4.12

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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.13":

Applying: Added a section for day2 operator for azure disk encryption sets.
.git/rebase-apply/patch:74: trailing whitespace.
The {product-title} installation program can use an existing Disk Encryption Set with a user-managed key. To enable this feature, create a `DiskEncryptionSet` in Azure and provide the key to the installation program. 
.git/rebase-apply/patch:89: trailing whitespace.
. Evacuate the pods from the compute node. There are several ways to do this. For example, you can evacuate all the pods or the selected pods on a node: 
.git/rebase-apply/patch:98: trailing whitespace.
For other options to evacuate pods from a node, see the "Understanding how to evacuate pods on nodes" section. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Added a section for day2 operator for azure disk encryption sets.

Details

In response to this:

/cherrypick enterprise-4.13

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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.14":

Applying: Added a section for day2 operator for azure disk encryption sets.
.git/rebase-apply/patch:74: trailing whitespace.
The {product-title} installation program can use an existing Disk Encryption Set with a user-managed key. To enable this feature, create a `DiskEncryptionSet` in Azure and provide the key to the installation program. 
.git/rebase-apply/patch:89: trailing whitespace.
. Evacuate the pods from the compute node. There are several ways to do this. For example, you can evacuate all the pods or the selected pods on a node: 
.git/rebase-apply/patch:98: trailing whitespace.
For other options to evacuate pods from a node, see the "Understanding how to evacuate pods on nodes" section. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Added a section for day2 operator for azure disk encryption sets.

Details

In response to this:

/cherrypick enterprise-4.14

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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.15":

Applying: Added a section for day2 operator for azure disk encryption sets.
.git/rebase-apply/patch:74: trailing whitespace.
The {product-title} installation program can use an existing Disk Encryption Set with a user-managed key. To enable this feature, create a `DiskEncryptionSet` in Azure and provide the key to the installation program. 
.git/rebase-apply/patch:89: trailing whitespace.
. Evacuate the pods from the compute node. There are several ways to do this. For example, you can evacuate all the pods or the selected pods on a node: 
.git/rebase-apply/patch:98: trailing whitespace.
For other options to evacuate pods from a node, see the "Understanding how to evacuate pods on nodes" section. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Added a section for day2 operator for azure disk encryption sets.

Details

In response to this:

/cherrypick enterprise-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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.16":

Applying: Added a section for day2 operator for azure disk encryption sets.
.git/rebase-apply/patch:74: trailing whitespace.
The {product-title} installation program can use an existing Disk Encryption Set with a user-managed key. To enable this feature, create a `DiskEncryptionSet` in Azure and provide the key to the installation program. 
.git/rebase-apply/patch:89: trailing whitespace.
. Evacuate the pods from the compute node. There are several ways to do this. For example, you can evacuate all the pods or the selected pods on a node: 
.git/rebase-apply/patch:98: trailing whitespace.
For other options to evacuate pods from a node, see the "Understanding how to evacuate pods on nodes" section. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging installing/installing_azure/enabling-user-managed-encryption-azure.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Added a section for day2 operator for azure disk encryption sets.

Details

In response to this:

/cherrypick enterprise-4.16

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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.17":

Applying: Added a section for day2 operator for azure disk encryption sets.
Applying: Fix merge error
Using index info to reconstruct a base tree...
M	modules/network-flow-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/network-flow-matrix.adoc
CONFLICT (content): Merge conflict in modules/network-flow-matrix.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Fix merge error

Details

In response to this:

/cherrypick enterprise-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 kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.18":

Applying: Added a section for day2 operator for azure disk encryption sets.
Applying: Fix merge error
Using index info to reconstruct a base tree...
M	modules/network-flow-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/network-flow-matrix.adoc
CONFLICT (content): Merge conflict in modules/network-flow-matrix.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Fix merge error

Details

In response to this:

/cherrypick enterprise-4.18

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-cherrypick-robot

@mburke5678: #101966 failed to apply on top of branch "enterprise-4.19":

Applying: Added a section for day2 operator for azure disk encryption sets.
Applying: Fix merge error
Using index info to reconstruct a base tree...
M	modules/network-flow-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/network-flow-matrix.adoc
CONFLICT (content): Merge conflict in modules/network-flow-matrix.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Fix merge error

Details

In response to this:

/cherrypick enterprise-4.19

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-cherrypick-robot

@mburke5678: new pull request created: #104184

Details

In response to this:

/cherrypick enterprise-4.20

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-cherrypick-robot

@mburke5678: new pull request created: #104185

Details

In response to this:

/cherrypick enterprise-4.21

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.

@mburke5678
Copy link
Contributor Author

Closed in favor of: #104190

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants