Skip to content

Comments

OPNET-392: deps: update openshift/api and client-go#2118

Closed
mkowalski wants to merge 3 commits intoopenshift:masterfrom
mkowalski:bump-openshift-api
Closed

OPNET-392: deps: update openshift/api and client-go#2118
mkowalski wants to merge 3 commits intoopenshift:masterfrom
mkowalski:bump-openshift-api

Conversation

@mkowalski
Copy link
Contributor

@mkowalski mkowalski commented Nov 20, 2023 •
edited
Loading

This PR contains 2 commits

  • upgrade openshift/api and openshift/client-go dependency
  • go mod tidy and vendor

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 20, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mkowalski
Once this PR has been reviewed and has the lgtm label, please assign abhat for approval. For more information see the Kubernetes Code Review Process.

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

Details 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

@mkowalski mkowalski force-pushed the bump-openshift-api branch 3 times, most recently from f3dcdf5 to 82226e3 Compare November 20, 2023 19:16
@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 20, 2023 •
edited
Loading

Seems like some API somewhere is missing

 level=error msg=Cluster operator network Degraded is True with UpdateOperatorConfig: Internal error while updating operator configuration: could not apply (operator.openshift.io/v1, Kind=Network) /cluster, err: failed to apply / update (operator.openshift.io/v1, Kind=Network) /cluster: failed to create typed patch object (/cluster; operator.openshift.io/v1, Kind=Network): .spec.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipv6: field not declared in schema

As it's defined in o/api, it may be that it is missing from the CRDs installed in the cluster and this happens probably in o/installer.

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 20, 2023

/hold

Need to update o/api in client-go first and then revendor new version of it

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 20, 2023
@mkowalski mkowalski changed the title deps: update openshift/api deps: update openshift/api and client-go Nov 21, 2023
@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 21, 2023

/retest-required

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 21, 2023

Metal still failing with

 level=error msg=Cluster operator network Degraded is True with UpdateOperatorConfig: Internal error while updating operator configuration: could not apply (operator.openshift.io/v1, Kind=Network) /cluster, err: failed to apply / update (operator.openshift.io/v1, Kind=Network) /cluster: failed to create typed patch object (/cluster; operator.openshift.io/v1, Kind=Network): .spec.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipv4: field not declared in schema

even though client-go has been updated. Need to dig deeper

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 24, 2023

/test e2e-metal-ipi-ovn-ipv6

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 24, 2023 •
edited by openshift-ci bot
Loading

/retitle OPNET-392: deps: update openshift/api and client-go

@openshift-ci openshift-ci bot changed the title deps: update openshift/api and client-go OPNET-392: deps: update openshift/api and client-go Nov 24, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 24, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 24, 2023 •
edited by openshift-ci bot
Loading

@mkowalski: This pull request references OPNET-392 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.15.0" version, but no target version was set.

Details

In response to this:

This PR contains 3 commits

  • upgrade openshift/api and openshift/client-go dependency
  • go mod tidy and vendor
  • manually fix CAPI and CR dependencies like in 9d6ce8d (this is not a creative change, simply a copy-pasta from the past)

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.

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 24, 2023

This depends on openshift/installer#7748. We get

failed to create typed patch object (/cluster; operator.openshift.io/v1, Kind=Network): .spec.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipv4: field not declared in schema

and it's o/installer who is installing the Network CRD in the first place. So before we make it install CRD with the updated schema, we cannot have CNO populate new fields.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 27, 2023 •
edited by openshift-ci bot
Loading

@mkowalski: This pull request references OPNET-392 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.15.0" version, but no target version was set.

Details

In response to this:

This PR contains 2 commits

  • upgrade openshift/api and openshift/client-go dependency
  • go mod tidy and vendor

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.

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 28, 2023

/retest-required

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 28, 2023

/unhold

o/installer stuff already in the merge pool

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2023
@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 28, 2023

/retest-required

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 28, 2023 •
edited
Loading 

.spec.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipv4: field not declared in schema 

 level=error msg=Cluster operator network Degraded is True with UpdateOperatorConfig: Internal error while updating operator configuration: could not apply (operator.openshift.io/v1, Kind=Network) /cluster, err: failed to apply / update (operator.openshift.io/v1, Kind=Network) /cluster: failed to create typed patch object (/cluster; operator.openshift.io/v1, Kind=Network): .spec.defaultNetwork.ovnKubernetesConfig.gatewayConfig.ipv4: field not declared in schema

(https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-network-operator/2118/pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn/1729406825918369792)

May be related to the client-go

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 28, 2023

/test e2e-metal-ipi-ovn-ipv6

Thanks @kyrtapz for pointing out the manifest generation! I would have wasted lots of time if not that hint!

@mkowalski
Copy link
Contributor Author

mkowalski commented Nov 29, 2023

/test e2e-aws-sdn-network-migration-rollback

.spec.migration.mode: field not declared in schema

🤡

@mkowalski
deps: update openshift/api and client-go
774dc19 
This PR upgrades openshift/api and openshift/client-go by running

```
go get github.com/openshift/api@master
go get github.com/openshift/client-go@master
```
@mkowalski
deps: go mod tidy and vendor
ecdeaee 
This PR cleans dependencies by running

```
go mod tidy
go mod vendor
```
@mkowalski
manifests: regenerate CNO CRD
aa82510
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2023

@mkowalski: 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-vsphere-ovn aa82510 link false /test e2e-vsphere-ovn
ci/prow/e2e-aws-ovn-network-migration aa82510 link true /test e2e-aws-ovn-network-migration
ci/prow/e2e-vsphere-ovn-windows aa82510 link true /test e2e-vsphere-ovn-windows
ci/prow/e2e-metal-ipi-ovn-ipv6 aa82510 link true /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws-hypershift-ovn-kubevirt aa82510 link false /test e2e-aws-hypershift-ovn-kubevirt
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 aa82510 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/e2e-aws-ovn-shared-to-local-gateway-mode-migration-periodic aa82510 link false /test e2e-aws-ovn-shared-to-local-gateway-mode-migration-periodic
ci/prow/e2e-azure-ovn-dualstack aa82510 link false /test e2e-azure-ovn-dualstack
ci/prow/e2e-aws-ovn-serial aa82510 link false /test e2e-aws-ovn-serial
ci/prow/e2e-aws-ovn-single-node aa82510 link false /test e2e-aws-ovn-single-node
ci/prow/e2e-aws-sdn-network-migration-rollback aa82510 link true /test e2e-aws-sdn-network-migration-rollback
ci/prow/4.15-upgrade-from-stable-4.14-e2e-aws-ovn-upgrade aa82510 link false /test 4.15-upgrade-from-stable-4.14-e2e-aws-ovn-upgrade
ci/prow/e2e-azure-ovn aa82510 link false /test e2e-azure-ovn

Full PR test history. Your PR dashboard.

Details

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-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 29, 2023
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 29, 2023

PR needs rebase.

Details

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.

@mkowalski
Copy link
Contributor Author

mkowalski commented Dec 5, 2023

/close

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 5, 2023

@mkowalski: Closed this PR.

Details

In response to this:

/close

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 closed this Dec 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dougbtv dougbtv Awaiting requested review from dougbtv

@JacobTanenbaum JacobTanenbaum Awaiting requested review from JacobTanenbaum

Assignees

No one assigned

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mkowalski @openshift-ci-robot @openshift-merge-robot