OCPBUGS-32371: Bump openshift/api, and update CRD generation #1045
Conversation
openshift-merge-robot
added
the
needs-rebase
Miciah
force-pushed
the
bump-openshift-slash-api-and-update-CRD-generation
branch
from
fab6fe6 to
0471dbb
Compare
openshift-merge-robot
removed
the
needs-rebase
Miciah
force-pushed
the
bump-openshift-slash-api-and-update-CRD-generation
branch
from
0471dbb to
0f316a4
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alebedev87 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Bump to github.com/openshift/api@ff84c2c732279b16baccf08c7dfc9ff8719c4807,
and update the CRD generation to adapt to changes in openshift/api:
go mod edit -replace=github.com/openshift/api=github.com/openshift/api@ff84c2c732279b16baccf08c7dfc9ff8719c4807
go mod tidy
go mod vendor
make update
Previously, the IngressController and DNSRecord CRD yaml manifests were
located directly under operator/v1/ and operatoringress/v1/ in the
openshift/api repository, and cluster-ingress-operator had .go files
that imported the "github.com/openshift/api/operator/v1" and
"github.com/openshift/api/operatoringress/v1" packages, which caused go
mod to vendor the yaml manifests. Recent changes in openshift/api moved
the yaml manifests under "zz_generated.crd-manifests" directories;
consequently, the existing import statements no longer cause go mod to
vendor the yaml manifests. In order to ensure that go mod does vendor
them, it is necessary to add explicit import statements for
"github.com/openshift/api/operator/v1/zz_generated.crd-manifests" and
"github.com/openshift/api/operatoringress/v1/zz_generated.crd-manifests".
This commit adds these import statements to tools/tool.go (which was
previously removed in commit 0b761da).
This commit also updates the CRD generation scripts to use the new
file paths under vendor/.
This commit fixes OCPBUGS-32371.
https://issues.redhat.com/browse/OCPBUGS-32371
* go.mod: Bump.
* hack/update-generated-crd.sh:
* hack/verify-generated-crd.sh: Update to use the new file paths under
vendor/.
* tools/tools.go: Add explicit imports for
"github.com/openshift/api/operator/v1/zz_generated.crd-manifests" and
"github.com/openshift/api/operatoringress/v1/zz_generated.crd-manifests".
* go.sum:
* manifests/00-custom-resource-definition-internal.yaml:
* manifests/00-custom-resource-definition.yaml:
* vendor/*: Regenerate.
Miciah
force-pushed
the
bump-openshift-slash-api-and-update-CRD-generation
branch
from
0f316a4 to
65dcb3f
Compare
Miciah
changed the title
openshift-ci-robot
added
jira/severity-important
|
@Miciah: This pull request references Jira Issue OCPBUGS-32371, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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
added
the
jira/invalid-bug
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@Miciah: This pull request references Jira Issue OCPBUGS-32371, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
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. |
|
/retest |
|
/lgtm |
|
@Miciah: Jira Issue OCPBUGS-32371: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-32371 has been moved to the MODIFIED state. DetailsIn response to this:
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. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-cluster-ingress-operator-container-v4.16.0-202404181209.p0.gd27fc3f.assembly.stream.el9 for distgit ose-cluster-ingress-operator. |
|
Fix included in accepted release 4.16.0-0.nightly-2024-04-21-123502 |
5 participants
Bump to github.com/openshift/api@ff84c2c732279b16baccf08c7dfc9ff8719c4807, and update the CRD generation to adapt to changes in openshift/api:
Previously, the IngressController and DNSRecord CRD yaml manifests were located directly under
operator/v1/andoperatoringress/v1/in the openshift/api repository, and cluster-ingress-operator had.gofiles that imported the"github.com/openshift/api/operator/v1"and"github.com/openshift/api/operatoringress/v1"packages, which causedgo modto vendor the yaml manifests. Recent changes in openshift/api moved the yaml manifests underzz_generated.crd-manifestsdirectories; consequently, the existing import statements no longer causego modto vendor the yaml manifests. In order to ensure thatgo moddoes vendor them, it is necessary to add explicit import statements for"github.com/openshift/api/operator/v1/zz_generated.crd-manifests"and"github.com/openshift/api/operatoringress/v1/zz_generated.crd-manifests". This PR adds these import statements totools/tool.go(which was previously removed in #905).This PR also updates the CRD generation scripts to use the new file paths under
vendor/.