-
Notifications
You must be signed in to change notification settings - Fork 9
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
build: add gen-csv files in downstream repo #581
Conversation
@travisn @Nikhil-Ladha PTAL |
cc @iamniting |
a644b3e
to
67d3641
Compare
I think we need to remove the csv in upstream, otherwise if this is merged and then upstream remove csv pr is merged then branch sync would have a problem. |
I am also somewhat concerned that this code is special for downstream and that it may be erased when github.com/rook/rook@master is resynced here, or to release-* branches. I certainly may also be misunderstanding something here. |
If we just skip one upstream commit that removes the csv related file, downstream should be good then I guess |
67d3641
to
015a798
Compare
015a798
to
5dfb5d9
Compare
We don't have to skip anything as such, once we are set to merge these changes at that time we should first delete the changes in upstream, sync those changes to downstream, rebase this PR and then merge. Then, everything should be good and we won't be facing any challenges. And, later syncs won't be a problem because we are just bring commits from upstream to downstream, that would continue as usual. |
IIRC, once we remove the csv generation files from upstream and sync that to downstream those file will be removed in downstream also and the csv generation will fail. But let's sync on this @Nikhil-Ladha |
9b04a3e
to
9568b1a
Compare
For me locally @travisn @BlaineEXE could anyone of you help in mac CI error? |
Looking at the CI error for macos, I think the build itself is succeeding properly. But in the "validate build" step afterward, the The git diff suggests that the status wants to remove all of the CRDs, judging by the
|
7761477
to
cdded69
Compare
I will prefer to do it in separate PR |
I don't have any problem with separate PR, but keep that item in mind as we cant track it separately anywhere. |
818482a
to
9d54419
Compare
cb3d7f1
to
5e27346
Compare
@iamniting PTAL |
email: ocs-support@redhat.com | ||
maturity: alpha | ||
provider: | ||
name: Provider Name |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you update this as well?
@iamniting: changing LGTM is restricted to collaborators In 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 kubernetes/test-infra repository. |
5e27346
to
5d1c928
Compare
CSV changes looks good to me |
5d1c928
to
4b75a66
Compare
since we don't need the csv generation to be part of our build image let's remove that. And add a check in CI to validate modified csv files. Signed-off-by: subhamkrai <srai@redhat.com>
moving all the default envs which were part of ocs-op rook csv to operator deployment. Signed-off-by: subhamkrai <srai@redhat.com>
4b75a66
to
4e66680
Compare
these are auto-generated csv changes Signed-off-by: subhamkrai <srai@redhat.com>
4e66680
to
cf15b59
Compare
/approve |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: sp98, subhamkrai The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
build: add gen-csv files in downstream repo
This commit add the csv related changes to downstream and
later will be removed from upstream also renaming make 'csv'
to 'gen-csv' and also adds validation check in ci to verify
right files are modified.
build: add csv envs to rook deploy envs
moving all the default envs which were part of
ocs-op rook csv to operator deployment.
build: these are auto-generated files
This commit contains auto-generated files
that are added/modified by running 'make gen-csv'.
Checklist: