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

OCPBUGS-29075: Move network.config status.conditions to GA #1755

Merged

Conversation

kyrtapz
Copy link
Contributor

@kyrtapz kyrtapz commented Feb 6, 2024

This is a follow up to #1747.
It was found during testing that ca64d33 missed moving the status.condtions (intorudced here) of network.config to GA.
/cc @martinkennelly @pliurh

Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

Hello @kyrtapz! 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.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 6, 2024
@kyrtapz kyrtapz changed the title [NP-906] Move network.config conditions to GA [NP-906] Move network.config status.conditions to GA Feb 6, 2024
ca64d33 promoted live migration to GA but it missed
graduating the status.condtions in network.config.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 6, 2024
@kyrtapz kyrtapz changed the title [NP-906] Move network.config status.conditions to GA NP-906: Move network.config status.conditions to GA Feb 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 6, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 6, 2024

@kyrtapz: This pull request references NP-906 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 bug to target either version "4.16." or "openshift-4.16.", but it targets "openshift-4.15" instead.

In response to this:

This is a follow up to #1747.
It was found during testing that ca64d33 missed moving the status.condtions (intorudced here) of network.config to GA.
/cc @martinkennelly @pliurh

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.

@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 6, 2024

Verified live migration progressing with cluster-bot:

oc get network.config -o yaml                                                                                                                                                                                                                                                                                                                         
...
  status:
...
    conditions:
    - lastTransitionTime: "2024-02-06T10:09:09Z"
      message: network operator initialize network type migration status
      reason: NetworkTypeMigrationInitialized
      status: "False"
      type: NetworkTypeMigrationMTUReady
    - lastTransitionTime: "2024-02-06T10:09:09Z"
      message: network operator initialize network type migration status
      reason: NetworkTypeMigrationInitialized
      status: "False"
      type: NetworkTypeMigrationTargetCNIAvailable
    - lastTransitionTime: "2024-02-06T10:09:09Z"
      message: network operator initialize network type migration status
      reason: NetworkTypeMigrationInitialized
      status: "False"
      type: NetworkTypeMigrationTargetCNIInUse
    - lastTransitionTime: "2024-02-06T10:09:09Z"
      message: network operator initialize network type migration status
      reason: NetworkTypeMigrationInitialized
      status: "False"
      type: NetworkTypeMigrationOriginalCNIPurged
    - lastTransitionTime: "2024-02-06T10:09:09Z"
      message: Network type migration is started
      reason: NetworkTypeMigrationStarted
      status: "True"
      type: NetworkTypeMigrationInProgress
    networkType: OVNKubernetes

@knobunc
Copy link
Contributor

knobunc commented Feb 6, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, kyrtapz

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2024
@kyrtapz
Copy link
Contributor Author

kyrtapz commented Feb 6, 2024

@martinkennelly lets modify the e2e tests to use GA once this PR merges.

@kyrtapz kyrtapz changed the title NP-906: Move network.config status.conditions to GA OCPBUGS-29075: Move network.config status.conditions to GA Feb 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 6, 2024
@openshift-ci-robot
Copy link

@kyrtapz: This pull request references Jira Issue OCPBUGS-29075, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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

In response to this:

This is a follow up to #1747.
It was found during testing that ca64d33 missed moving the status.condtions (intorudced here) of network.config to GA.
/cc @martinkennelly @pliurh

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.

Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

@kyrtapz: 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 5e307cc link false /test e2e-azure
ci/prow/e2e-gcp 5e307cc link false /test e2e-gcp

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 413e7e5 into openshift:master Feb 6, 2024
15 of 17 checks passed
@openshift-ci-robot
Copy link

@kyrtapz: Jira Issue OCPBUGS-29075: All pull requests linked via external trackers have merged:

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

In response to this:

This is a follow up to #1747.
It was found during testing that ca64d33 missed moving the status.condtions (intorudced here) of network.config to GA.
/cc @martinkennelly @pliurh

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

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-config-api-container-v4.16.0-202402061442.p0.g413e7e5.assembly.stream.el9 for distgit ose-cluster-config-api.
All builds following this will include this PR.

@abhat
Copy link
Contributor

abhat commented Feb 6, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot

@abhat: #1755 failed to apply on top of branch "release-4.15":

Applying: Move network.config conditions to GA
Using index info to reconstruct a base tree...
M	config/v1/0000_10_config-operator_01_network-Default.crd.yaml
M	config/v1/stable.network.testsuite.yaml
M	config/v1/types_network.go
M	payload-manifests/crds/0000_10_config-operator_01_network-Default.crd.yaml
Falling back to patching base and 3-way merge...
Auto-merging payload-manifests/crds/0000_10_config-operator_01_network-Default.crd.yaml
CONFLICT (content): Merge conflict in payload-manifests/crds/0000_10_config-operator_01_network-Default.crd.yaml
Auto-merging config/v1/0000_10_config-operator_01_network-Default.crd.yaml
CONFLICT (content): Merge conflict in config/v1/0000_10_config-operator_01_network-Default.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move network.config conditions to GA
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants