Skip to content
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

[release-4.14] OCPBUGS-24037: remove all managed fields used by old manager #2112

Merged

Conversation

jluhrsen
Copy link
Contributor

the old manager "cluster-network-operator" was changed to "cluster-network-operator/operconfig" in 4.11 when server-side-apply was migrated to from client-side-apply. However, the old operator still had it's own managed fields and some interaction between those and the change to remove preStop hooks in ovnkube-master's daemonset containers was causing upgrades to stick in the network operator.

this will just remove the old manager (and it's managed fields) entirely. it's done before the update to apply the object instead of after.

JIRA: https://issues.redhat.com/browse/OCPBUGS-22293

deal w/ deprecated field manager before apply

@jluhrsen jluhrsen changed the title remove all managed fields used by old manager 4.14: remove all managed fields used by old manager Nov 17, 2023
@jluhrsen
Copy link
Contributor Author

/retest

2 similar comments
@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/test ci/prow/e2e-aws-sdn-network-migration-rollback
/test ci/prow/e2e-aws-sdn-network-reverse-migration

Copy link
Contributor

openshift-ci bot commented Nov 20, 2023

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

  • /test 4.14-upgrade-from-stable-4.13-images
  • /test e2e-aws-ovn-network-migration
  • /test e2e-aws-ovn-windows
  • /test e2e-aws-sdn-multi
  • /test e2e-aws-sdn-network-migration-rollback
  • /test e2e-aws-sdn-network-reverse-migration
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upgrade
  • /test e2e-gcp-sdn
  • /test e2e-hypershift-ovn
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-vsphere-ovn-windows
  • /test images
  • /test lint
  • /test unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test 4.14-upgrade-from-stable-4.13-e2e-aws-ovn-upgrade
  • /test 4.14-upgrade-from-stable-4.13-e2e-azure-ovn-upgrade
  • /test 4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade
  • /test e2e-aws-hypershift-ovn-kubevirt
  • /test e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • /test e2e-aws-ovn-serial
  • /test e2e-aws-ovn-shared-to-local-gateway-mode-migration-periodic
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-sdn-upgrade
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-dualstack
  • /test e2e-azure-ovn-manual-oidc
  • /test e2e-metal-ipi-ovn-ipv6-ipsec
  • /test e2e-network-mtu-migration-ovn-ipv4
  • /test e2e-network-mtu-migration-ovn-ipv6
  • /test e2e-network-mtu-migration-sdn-ipv4
  • /test e2e-openstack-kuryr
  • /test e2e-openstack-ovn
  • /test e2e-openstack-sdn
  • /test e2e-ovn-hybrid-step-registry
  • /test e2e-ovn-ipsec-step-registry
  • /test e2e-ovn-step-registry
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-ovn-dualstack
  • /test e2e-vsphere-ovn-dualstack-primaryv6
  • /test qe-perfscale-aws-ovn-medium-cluster-density
  • /test qe-perfscale-aws-ovn-medium-node-density-cni
  • /test qe-perfscale-aws-ovn-small-cluster-density
  • /test qe-perfscale-aws-ovn-small-node-density-cni

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-cluster-network-operator-release-4.14-4.14-upgrade-from-stable-4.13-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-release-4.14-4.14-upgrade-from-stable-4.13-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-release-4.14-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-release-4.14-4.14-upgrade-from-stable-4.13-images
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-hypershift-ovn-kubevirt
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-network-migration
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-serial
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-shared-to-local-gateway-mode-migration-periodic
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-single-node
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-ovn-windows
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-sdn-multi
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-sdn-network-migration-rollback
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-sdn-network-reverse-migration
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-aws-sdn-upgrade
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-azure-ovn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-azure-ovn-dualstack
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-gcp-ovn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-gcp-sdn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-hypershift-ovn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-metal-ipi-ovn-ipv6-ipsec
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-network-mtu-migration-ovn-ipv4
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-network-mtu-migration-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-network-mtu-migration-sdn-ipv4
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-openstack-kuryr
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-openstack-ovn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-openstack-sdn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-ovn-hybrid-step-registry
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-ovn-ipsec-step-registry
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-ovn-step-registry
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-vsphere-ovn
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-vsphere-ovn-dualstack
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-vsphere-ovn-dualstack-primaryv6
  • pull-ci-openshift-cluster-network-operator-release-4.14-e2e-vsphere-ovn-windows
  • pull-ci-openshift-cluster-network-operator-release-4.14-images
  • pull-ci-openshift-cluster-network-operator-release-4.14-lint
  • pull-ci-openshift-cluster-network-operator-release-4.14-unit
  • pull-ci-openshift-cluster-network-operator-release-4.14-verify

In response to this:

/test ci/prow/e2e-aws-sdn-network-migration-rollback
/test ci/prow/e2e-aws-sdn-network-reverse-migration

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/test-infra repository.

@jluhrsen
Copy link
Contributor Author

/retest

5 similar comments
@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

/jira cherrypick OCPBUGS-22293

@openshift-ci-robot
Copy link
Contributor

@jluhrsen: Jira Issue OCPBUGS-22293 has been cloned as Jira Issue OCPBUGS-24037. Will retitle bug to link to clone.

WARNING: Failed to update the target version for the clone. Please update the target version manually. Full error below:

Full error message. customfield_12323140 - Field 'customfield_12323140' cannot be set. It is not on the appropriate screen, or unknown.: request failed. Please analyze the request body for more details. Status code: 400:
/retitle OCPBUGS-24037: 4.14: remove all managed fields used by old manager

In response to this:

/jira cherrypick OCPBUGS-22293

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/test-infra repository.

@openshift-ci openshift-ci bot changed the title 4.14: remove all managed fields used by old manager OCPBUGS-24037: 4.14: remove all managed fields used by old manager Nov 28, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 28, 2023
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: This pull request references Jira Issue OCPBUGS-24037, which is invalid:

  • expected the bug to target the "4.14.z" version, but no target version was set
  • expected dependent Jira Issue OCPBUGS-22293 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-22293 to target a version in 4.15.0, but no target version was set

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:

the old manager "cluster-network-operator" was changed to "cluster-network-operator/operconfig" in 4.11 when server-side-apply was migrated to from client-side-apply. However, the old operator still had it's own managed fields and some interaction between those and the change to remove preStop hooks in ovnkube-master's daemonset containers was causing upgrades to stick in the network operator.

this will just remove the old manager (and it's managed fields) entirely. it's done before the update to apply the object instead of after.

JIRA: https://issues.redhat.com/browse/OCPBUGS-22293

deal w/ deprecated field manager before apply

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/test-infra repository.

@jluhrsen jluhrsen changed the title OCPBUGS-24037: 4.14: remove all managed fields used by old manager [release-4.14] OCPBUGS-24037: remove all managed fields used by old manager Nov 28, 2023
@jluhrsen
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@jluhrsen: This pull request references Jira Issue OCPBUGS-24037, which is invalid:

  • expected dependent Jira Issue OCPBUGS-22293 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-22293 to target a version in 4.15.0, but no target version was set

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:

/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 kubernetes/test-infra repository.

@jluhrsen
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@jluhrsen: This pull request references Jira Issue OCPBUGS-24037, which is invalid:

  • expected dependent Jira Issue OCPBUGS-24036 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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.

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 kubernetes/test-infra repository.

@jluhrsen
Copy link
Contributor Author

jluhrsen commented Dec 1, 2023

/retest

1 similar comment
@jluhrsen
Copy link
Contributor Author

jluhrsen commented Dec 8, 2023

/retest

@sdodson
Copy link
Member

sdodson commented Jan 9, 2024

Based on #2112 (comment) i'm going to add all required to merge labels.

@sdodson sdodson added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Jan 9, 2024
Copy link
Contributor

openshift-ci bot commented Jan 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: flavio-fernandes, jluhrsen

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:

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

@sdodson
Copy link
Member

sdodson commented Jan 9, 2024

/skip

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 2d7ced4 and 2 for PR HEAD 7256803 in total

@jluhrsen
Copy link
Contributor Author

jluhrsen commented Jan 9, 2024

/retest

1 similar comment
@jluhrsen
Copy link
Contributor Author

/retest

@jluhrsen
Copy link
Contributor Author

the e2e-vsphere-ovn-windows job has a pass rate under 50% so it may take a few retests for it to pass

@sdodson
Copy link
Member

sdodson commented Jan 10, 2024

/override ci/prow/e2e-vsphere-ovn-windows

Copy link
Contributor

openshift-ci bot commented Jan 10, 2024

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-vsphere-ovn-windows

In response to this:

/override ci/prow/e2e-vsphere-ovn-windows

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/test-infra repository.

Copy link
Contributor

openshift-ci bot commented Jan 10, 2024

@jluhrsen: 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-azure-ovn-dualstack 7256803 link false /test e2e-azure-ovn-dualstack
ci/prow/e2e-openstack-kuryr 7256803 link false /test e2e-openstack-kuryr
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 7256803 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/e2e-openstack-sdn 7256803 link false /test e2e-openstack-sdn
ci/prow/e2e-vsphere-ovn-dualstack 7256803 link false /test e2e-vsphere-ovn-dualstack
ci/prow/e2e-openstack-ovn 7256803 link false /test e2e-openstack-ovn
ci/prow/e2e-vsphere-ovn-windows 7256803 link true /test e2e-vsphere-ovn-windows

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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 8cf22aa into openshift:release-4.14 Jan 10, 2024
41 checks passed
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: Jira Issue OCPBUGS-24037: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-24037 has been moved to the MODIFIED state.

In response to this:

the old manager "cluster-network-operator" was changed to "cluster-network-operator/operconfig" in 4.11 when server-side-apply was migrated to from client-side-apply. However, the old operator still had it's own managed fields and some interaction between those and the change to remove preStop hooks in ovnkube-master's daemonset containers was causing upgrades to stick in the network operator.

this will just remove the old manager (and it's managed fields) entirely. it's done before the update to apply the object instead of after.

JIRA: https://issues.redhat.com/browse/OCPBUGS-22293

deal w/ deprecated field manager before apply

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-network-operator-container-v4.14.0-202401100355.p0.g8cf22aa.assembly.stream for distgit cluster-network-operator.
All builds following this will include this PR.

@rbbratta
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 10, 2024
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: Jira Issue OCPBUGS-24037 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

the old manager "cluster-network-operator" was changed to "cluster-network-operator/operconfig" in 4.11 when server-side-apply was migrated to from client-side-apply. However, the old operator still had it's own managed fields and some interaction between those and the change to remove preStop hooks in ovnkube-master's daemonset containers was causing upgrades to stick in the network operator.

this will just remove the old manager (and it's managed fields) entirely. it's done before the update to apply the object instead of after.

JIRA: https://issues.redhat.com/browse/OCPBUGS-22293

deal w/ deprecated field manager before apply

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.

@jluhrsen jluhrsen deleted the OCPBUGS-22293-4.14 branch April 19, 2024 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet