Fix remaining Makefile issues + annoying bundle date #291
Conversation
After the recent reworking on the Makefile, there were still some pending issues. E.g. we introduced a "deploy-latest" target but it did not allow to override the operator image. This is rollbacking part of the last changes: - deploy-latest is removed, we can run "make deploy" as we used to do before - make deploy now uses again "main" images by default, as before - keeping the behaviour that Mohamed introduced, "make bundle" keeps using the provided IMG - UNLIKE before: running "make bundle" alone will NOT update the bundle so it is ready for commit; For that, a new target "make update-bundle" is introduced - "make bundle" does not generate the creation date as it used to do. This is now done via "make bundle-build". It means that RELEASE SCRIPTS HAVE TO BE UPDATED so they generate the creation date.
Codecov Report
@@ Coverage Diff @@
## main #291 +/- ##
==========================================
+ Coverage 47.42% 47.61% +0.19%
==========================================
Files 43 43
Lines 4951 5015 +64
==========================================
+ Hits 2348 2388 +40
- Misses 2395 2416 +21
- Partials 208 211 +3
Flags with carried forward coverage won't be shown. Click here to find out more. see 7 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
| $(OCI_BIN) build -f bundle.Dockerfile -t $(BUNDLE_IMG) . | ||
| mv tmp-bundle ./bundle/manifests/netobserv-operator.clusterserviceversion.yaml |
There was a problem hiding this comment.
If the Docker build fails (line 333), then it won't move the file back to its original state. An improvement is to put a leading - so it ignores any error and hence, the next statement will run.
-$(OCI_BIN) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
The slight drawback is that it will say the error is ignored. It's also not a complete solution since aborting with ctrl-c will still be a problem. The best practice is to modify the copied file instead, but I understand it may not be easily done in this situation.
There was a problem hiding this comment.
I did what you suggested first - I think that's ok, we can live with the little drawback
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jotak 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 |
After the recent reworking on the Makefile, there were still some pending issues. E.g. we introduced a "deploy-latest" target but it did not allow to override the operator image.
This is rollbacking part of the last changes: