Skip to content

MCO OCL correct an annotation #96184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2025
Merged

Conversation

mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Jul 16, 2025

umohnani8 asked for this change in #96116 (comment). That PR is 4.18 only. This PR brings the change to main and 4.19+. Dev and QE reviews in original PR.

Preview:
Removing an on-cluster custom layered image - Edited closing paragraph.

QE review:

  • QE has approved this change.

@mburke5678 mburke5678 added this to the Continuous Release milestone Jul 16, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 16, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 16, 2025

🤖 Thu Jul 17 18:39:51 - Prow CI generated the docs preview:

https://96184--ocpdocs-pr.netlify.app/openshift-enterprise/latest/machine_configuration/mco-coreos-layering.html

@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 16, 2025
@mburke5678 mburke5678 added the peer-review-needed Signifies that the peer review team needs to review this PR label Jul 16, 2025
@ShaunaDiaz ShaunaDiaz added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jul 17, 2025
@@ -10,4 +10,4 @@ To prevent the custom layered images from taking up excessive space in your regi

The credentials provided by the registry push secret that you added to the `MachineOSBuild` object must grant the permission for deleting an image from the registry. If the delete permission is not provided, the image is not removed when you delete the `MachineOSBuild` object.

Note that the custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentConfig` or `machineconfiguration.openshift.io/desiredConfig` annotation on the node.
Note that the custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentImage` or `machineconfiguration.openshift.io/desiredImage` annotation on the node, which are added to the node upon creating the `MachineOSConfig` object.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Note that the custom layered image is not deleted if the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentImage` or `machineconfiguration.openshift.io/desiredImage` annotation on the node, which are added to the node upon creating the `MachineOSConfig` object.
The custom layered image is not deleted when the image is either currently in use on a node or is desired by the nodes, as indicated by the `machineconfiguration.openshift.io/currentImage` or `machineconfiguration.openshift.io/desiredImage` annotations on the node. Both annotations can be added to the node when you create the `MachineOSConfig` object.

clearer, I think? not certain if the object is created by the user or is an automatic process, but you get the gist of what I am suggesting....

@ShaunaDiaz ShaunaDiaz added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Jul 17, 2025
Copy link

openshift-ci bot commented Jul 17, 2025

@mburke5678: all tests passed!

Full PR test history. Your PR dashboard.

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 0fa5e1f into openshift:main Jul 17, 2025
2 checks passed
@mburke5678 mburke5678 deleted the fix-annotation branch July 17, 2025 18:43
@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.19

@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@mburke5678: new pull request created: #96300

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: #96301

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.19 branch/enterprise-4.20 peer-review-done Signifies that the peer review team has reviewed this PR 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.

4 participants