[release-4.20] OCPBUGS-61977: Add 'AGE' print column to MachineConfigNode object

[isabella-janssen]

This is a manual cherry-pick of #2476 since the automated cherry-pick in #2486 did not include correct generated files.

The diff for the generated files can be seen here ca2a6f5.

[openshift-ci-robot]

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

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.0) matches configured target version for branch (4.20.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-61689 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-61689 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

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

In response to this:

This is a manual cherry-pick of #2476 since the automated cherry-pick in #2486 did not include correct generated files.

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]

Hello @isabella-janssen! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

[JoelSpeed]

/lgtm
/label backport-risk-assessed

[openshift-ci-robot]

/test remaining-required

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 [JoelSpeed]

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

[openshift-ci]

@openshift-ci-robot: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build

/test e2e-aws-ovn

/test e2e-aws-ovn-hypershift

/test e2e-aws-ovn-hypershift-conformance

/test e2e-aws-ovn-techpreview

/test e2e-aws-serial-1of2

/test e2e-aws-serial-2of2

/test e2e-aws-serial-techpreview-1of2

/test e2e-aws-serial-techpreview-2of2

/test e2e-upgrade

/test e2e-upgrade-out-of-change

/test images

/test integration

/test lint

/test unit

/test verify

/test verify-client-go

/test verify-crd-schema

/test verify-deps

/test verify-feature-promotion

The following commands are available to trigger optional jobs:

/test e2e-azure

/test e2e-gcp

Use /test all to run all jobs.

In response to this:

/test remaining-required

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.

[isabella-janssen]

/verified by @isabella-janssen

Verified in a 4.20 cluster with this PR included:

$ oc get machineconfignode
NAME                                         POOLNAME   DESIREDCONFIG                                      CURRENTCONFIG                                      UPDATED   AGE
ip-10-0-104-178.us-east-2.compute.internal   master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-3-210.us-east-2.compute.internal     master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-34-112.us-east-2.compute.internal    master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-62-31.us-east-2.compute.internal     worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      57m
ip-10-0-69-179.us-east-2.compute.internal    worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      57m

$ oc get machineconfignode -o wide
NAME                                         POOLNAME   DESIREDCONFIG                                      CURRENTCONFIG                                      UPDATED   AGE   UPDATEPREPARED   UPDATEEXECUTED   UPDATEPOSTACTIONCOMPLETE   UPDATECOMPLETE   RESUMED   UPDATEDFILESANDOS   CORDONEDNODE   DRAINEDNODE   REBOOTEDNODE   UNCORDONEDNODE
ip-10-0-104-178.us-east-2.compute.internal   master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-3-210.us-east-2.compute.internal     master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-34-112.us-east-2.compute.internal    master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-62-31.us-east-2.compute.internal     worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      58m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-69-179.us-east-2.compute.internal    worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      58m   False            False            False                      False            False     False               False          False         False          False

[openshift-ci-robot]

@isabella-janssen: This PR has been marked as verified by @isabella-janssen.

In response to this:

/verified by @isabella-janssen

Verified in a 4.20 cluster with this PR included:

$ oc get machineconfignode
NAME                                         POOLNAME   DESIREDCONFIG                                      CURRENTCONFIG                                      UPDATED   AGE
ip-10-0-104-178.us-east-2.compute.internal   master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-3-210.us-east-2.compute.internal     master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-34-112.us-east-2.compute.internal    master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m
ip-10-0-62-31.us-east-2.compute.internal     worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      57m
ip-10-0-69-179.us-east-2.compute.internal    worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      57m

$ oc get machineconfignode -o wide
NAME                                         POOLNAME   DESIREDCONFIG                                      CURRENTCONFIG                                      UPDATED   AGE   UPDATEPREPARED   UPDATEEXECUTED   UPDATEPOSTACTIONCOMPLETE   UPDATECOMPLETE   RESUMED   UPDATEDFILESANDOS   CORDONEDNODE   DRAINEDNODE   REBOOTEDNODE   UNCORDONEDNODE
ip-10-0-104-178.us-east-2.compute.internal   master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-3-210.us-east-2.compute.internal     master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-34-112.us-east-2.compute.internal    master     rendered-master-105785906d8f2462f59759e91029ab5a   rendered-master-105785906d8f2462f59759e91029ab5a   True      68m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-62-31.us-east-2.compute.internal     worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      58m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-69-179.us-east-2.compute.internal    worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      58m   False            False            False                      False            False     False               False          False         False          False
ip-10-0-8-146.us-east-2.compute.internal     worker     rendered-worker-00167b4b0b487d0be01861f2f3caaa43   rendered-worker-00167b4b0b487d0be01861f2f3caaa43   True      10m   False            False            False                      False            False     False               False          False         False          False

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]

/retest-required

Remaining retests: 0 against base HEAD a2b450e and 2 for PR HEAD 580e016 in total

[openshift-ci]

@isabella-janssen: 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.

[openshift-ci-robot]

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-61977
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-61977 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

This is a manual cherry-pick of #2476 since the automated cherry-pick in #2486 did not include correct generated files.

The diff for the generated files can be seen here ca2a6f5.

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]

/cherrypick release-4.19

[openshift-cherrypick-robot]

@isabella-janssen: #2497 failed to apply on top of branch "release-4.19":

Applying: MachineConfigNode: add 'AGE' print column
Using index info to reconstruct a base tree...
M	machineconfiguration/v1/types_machineconfignode.go
A	machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml
A	machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-Default.crd.yaml
A	machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml
A	machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml
M	machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml
A	machineconfiguration/v1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/IrreconcilableMachineConfig.yaml
A	payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml
A	payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-Default.crd.yaml
A	payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml
A	payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml
Falling back to patching base and 3-way merge...
Auto-merging payload-manifests/crds/0000_80_machine-config_01_machineconfignodes.crd.yaml
CONFLICT (modify/delete): payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml deleted in HEAD and modified in MachineConfigNode: add 'AGE' print column. Version MachineConfigNode: add 'AGE' print column of payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml left in tree.
CONFLICT (modify/delete): payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml deleted in HEAD and modified in MachineConfigNode: add 'AGE' print column. Version MachineConfigNode: add 'AGE' print column of payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml left in tree.
CONFLICT (modify/delete): payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml deleted in HEAD and modified in MachineConfigNode: add 'AGE' print column. Version MachineConfigNode: add 'AGE' print column of payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml left in tree.
Auto-merging machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml
Auto-merging machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes.crd.yaml
Auto-merging machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yaml
Auto-merging machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes.crd.yaml
CONFLICT (modify/delete): machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml deleted in HEAD and modified in MachineConfigNode: add 'AGE' print column. Version MachineConfigNode: add 'AGE' print column of machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml left in tree.
CONFLICT (modify/delete): machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml deleted in HEAD and modified in MachineConfigNode: add 'AGE' print column. Version MachineConfigNode: add 'AGE' print column of machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml left in tree.
Auto-merging machineconfiguration/v1/types_machineconfignode.go
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 MachineConfigNode: add 'AGE' print column

In response to this:

/cherrypick release-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.