Skip to content

Fix generate CRD script by using copy #748

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

Closed
wants to merge 2 commits into from

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented May 20, 2024

Using a symlink to point inside the staging directories seems to confuse newer versions of sigs.k8s.io/controller-tools.

Specifically, the set up of a temporary directory for controller-gen uses a symlink into staging/api, which confuses something in golang to use ${ROOT}/staging/api/go.mod rather than ${ROOT}/go.mod, causing it to return errors that indicate go.mod inconsistencies with vendor/modules.txt. This would normally be fixable via the go mod commands, but looking at the wrong go.mod is not a normal situation.

@openshift-ci openshift-ci bot requested review from anik120 and joelanford May 20, 2024 21:15
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2024
@joelanford
Copy link
Member

/lgtm
/approve

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

openshift-ci bot commented May 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, tmshort

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

@joelanford
Copy link
Member

/test e2e-gcp-olm

@tmshort
Copy link
Contributor Author

tmshort commented May 21, 2024

/retest

1 similar comment
@tmshort
Copy link
Contributor Author

tmshort commented May 21, 2024

/retest

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 22, 2024
Copy link
Contributor

openshift-ci bot commented May 22, 2024

New changes are detected. LGTM label has been removed.

ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
WORKDIR /src
COPY . .
# Install golang 1.22.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ART is generating a new registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 we can use here to coordinate with new go1.22 toolchain.

@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 May 22, 2024
@tmshort
Copy link
Contributor Author

tmshort commented May 22, 2024

OK, not sure why I'm getting manifest changes, now? It wasn't the case earlier? And also operator-registry is now having issues with the stable hash?

@tmshort
Copy link
Contributor Author

tmshort commented May 23, 2024

/test images
/rest periodics-images

@tmshort
Copy link
Contributor Author

tmshort commented May 23, 2024

/test periodics-images

tmshort added 2 commits May 23, 2024 10:46
Using a symlink to point inside the staging directories seems to confuse
newer versions of sigs.k8s.io/controller-tools.

Specifically, the set up of a temporary directory for controller-gen
uses a symlink into staging/api, which confuses _something_ in golang
to use ${ROOT}/staging/api/go.mod rather than ${ROOT}/go.mod, causing
it to return errors that indicate go.mod inconsistencies with
vendor/modules.txt. This would normally be fixable via the `go mod`
commands, but looking at the wrong go.mod is not a normal situation.

Signed-off-by: Todd Short <[email protected]>
Copy link
Contributor

openshift-ci bot commented May 23, 2024

@tmshort: 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/unit-registry 211d788 link true /test unit-registry
ci/prow/e2e-gcp-olm 211d788 link true /test e2e-gcp-olm
ci/prow/e2e-gcp-ovn 211d788 link true /test e2e-gcp-ovn

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.

jianzhangbjz pushed a commit to jianzhangbjz/operator-framework-olm that referenced this pull request May 28, 2024
* render: support rendering FBC from bundle and packagemanifest directories

In order to generate expected olm.bundles, this commit also adds a new
--image-ref-template flag to the `render` subcommand, which callers
can use to generate image references from source data based on package
name, bundle name, and bundle version.

Signed-off-by: Joe Lanford <[email protected]>

* make --image-ref-template alpha (and include simple framework for alpha flags and usage)

Signed-off-by: Joe Lanford <[email protected]>

---------

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: a21f962e4b609f61257d4e78745e26c298ac53d4
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2024
@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

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.

@tmshort
Copy link
Contributor Author

tmshort commented Jun 4, 2024

Done as part of the latest, large downstream.

@tmshort tmshort closed this Jun 4, 2024
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants