OCPBUGS-52302: MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

[isabella-janssen]

- Authors

• Note that this is a rebased & modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.
   • Spec.ConfigImage.DesiredImage
   • Status.ConfigImage.CurrentImage
   • Status.ConfigImage.DesiredImage
   • Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it
MCO-1713:

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
  name: worker
spec:
  machineConfigPool:
    name: worker
  imageBuilder:
    imageBuilderType: Job
  renderedImagePushSecret:
    name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
  renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
   • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement. See this thread for more details on the intended experience.
   • The new MCN fields should be correctly populated.
     • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
     • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.
4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.
   • The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process. See this thread for more details on the intended experience.
   • The new MCN fields should be correctly populated.
     • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
     • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

OCPBUGS-52302:

1. Launch a 4.21 cluster with this PR build included. Note that it can be a tech preview cluster, but does not need to be.

launch 4.21,openshift/machine-config-operator#5282 aws

2. Apply a MachineConfig to trigger a node update.
3. Track how the desired configs are updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields; OCPBUGS-52302: Correct timing of desired config being set in MCN spec

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [isabella-janssen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. • Assisted by cursor * Update MCN flows to add new image-mode specific fields.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

- Description for the changelog

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments

---

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set

---

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable

---

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

---

Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in #5177.

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

---

- Authors

• Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

---

- Authors

• Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.
2. Enable On Cluster Image Mode.
3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.

---

- Authors

• Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.
• Make sure desired image is removed from spec immediately

---

- Authors

• Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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.

[isabella-janssen]

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3 payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-techpreview-serial

[openshift-ci]

@isabella-janssen: trigger 4 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
• periodic-ci-openshift-release-master-ci-4.21-e2e-gcp-ovn-techpreview-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6020a8e0-9d6b-11f0-88e9-55df9f5437a6-0

[openshift-ci-robot]

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

TODO:

• Make sure updated flips on config image anno update
• Make sure image pull condition shows in default condition list (if wanted)
• Check on OCL disable clearing desired image
• Check on TODO comments
• On OCL enable make sure desired anno does not get get set to not yet set
• Make sure current image is removed on OCL disable
• Update the Action during update to rendered-worker-xyz to instead include the reference to the image anno update if its a layered image update.
• Make sure desired image is removed from spec immediately
• Question: ImagePulledFromRegistry is not removed on OCL disable currently. Do we want to remove it when OCL is disabled or keep it for history?

---

- Authors

• Note that this is a rebased & slightly modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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.

[isabella-janssen]

/payload-job periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

[openshift-ci]

@isabella-janssen: trigger 4 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview
• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
• periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/576ab930-9efa-11f0-9cfa-5f7ce78d0e6d-0

[openshift-ci-robot]

@isabella-janssen: This pull request references MCO-1713 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

- Authors

• Note that this is a rebased & modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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

@isabella-janssen: This pull request references Jira Issue OCPBUGS-52302, which is invalid:

• expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "4.20.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

- Authors

• Note that this is a rebased & modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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.

[isabella-janssen]

/jira refresh

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-52302, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.0) matches configured target version for branch (4.21.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

/jira refresh

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

@isabella-janssen: This pull request references Jira Issue OCPBUGS-52302, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.0) matches configured target version for branch (4.21.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

- Authors

• Note that this is a rebased & modified version of work previously completed by @naseerahkani in MCO-1713:[API 4/6] Update MCO to reflect API changes made for Status Reporting #5177.
• Some modifications were assisted by Cusor, as noted below

- What I did

1. Version bump the API to openshift/api@2acafd4 & client-go to openshift/client-go@1bc0cb0.

$ go get github.com/openshift/api@2acafd4d1ed26c67ec29e85715ee1995ae6f1904
$ go mod tidy
$ go get github.com/openshift/client-go@1bc0cb0da03b4bf85cd730124085cb982b66d926
$ go mod tidy
$ go mod vendor

2. Update MCN flows to add new image-mode specific fields. Note that this part of implementation was assisted by cursor.

• Spec.ConfigImage.DesiredImage
• Status.ConfigImage.CurrentImage
• Status.ConfigImage.DesiredImage
• Status.Conditions[MachineConfigNodeImagePulledFromRegistry]

- How to verify it
_ MCO-1713:_

1. Launch a 4.21 techpreview cluster with this PR included.

launch 4.21,openshift/machine-config-operator#5282 aws,techpreview

2. Enable On Cluster Image Mode.

$ oc create -f - << EOF           
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineOSConfig
metadata:
 name: worker
spec:
 machineConfigPool:
   name: worker
 imageBuilder:
   imageBuilderType: Job
 renderedImagePushSecret:
   name: $(oc get -n openshift-machine-config-operator sa builder -ojsonpath='{.secrets[0].name}')
 renderedImagePushSpec: "image-registry.openshift-image-registry.svc:5000/openshift-machine-config-operator/ocb-image:latest"
EOF

3. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB enablement. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB rollout, the desired image annotation should be set at the beginning of the node update before the current image annotation is set.
  • Once OCB is fully enabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be set appropriately.

4. Disable On Cluster Image Mode.

oc delete machineosconfig/worker

5. Check the MachineConfigNode resources for the nodes where image mode was enabled to ensure the conditions were properly populated.

• The columns in the outputs for oc get machineconfignode -w and oc get machineconfignode -o wide -w should properly update during the OCB disabling process. See this thread for more details on the intended experience.
• The new MCN fields should be correctly populated.
  • During the OCB disabling, the desired image annotation should be removed at the beginning of the node update before the current image annotation is removed.
  • Once OCB is fully disabled on a node, the node should be considered "Updated" and the desired and current image annotation values should be removed in both the MCN Spec and Status.

_ OCPBUGS-52302:_

1. Launch a 4.21 cluster with this PR build included. Note that it can be a tech preview cluster, but does not need to be.

launch 4.21,openshift/machine-config-operator#5282 aws

2. Apply a MachineConfig to trigger a node update.
3. Track how the desired configs are updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
MCO-1713: Update MachineConfigNode resource to include on cluster image mode fields

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]

@isabella-janssen: 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/e2e-aws-mco-disruptive	cc7779c	link	false	/test e2e-aws-mco-disruptive
ci/prow/e2e-gcp-op-ocl	cc7779c	link	false	/test e2e-gcp-op-ocl
ci/prow/okd-scos-e2e-aws-ovn	cc7779c	link	false	/test okd-scos-e2e-aws-ovn
ci/prow/e2e-azure-ovn-upgrade-out-of-change	cc7779c	link	false	/test e2e-azure-ovn-upgrade-out-of-change
ci/prow/bootstrap-unit	cc7779c	link	false	/test bootstrap-unit

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.