swap-image-csv.sh updates and minor fixes to set-plugin-image #535
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #535 +/- ##
==========================================
- Coverage 57.83% 57.63% -0.21%
==========================================
Files 70 70
Lines 9446 9446
==========================================
- Hits 5463 5444 -19
- Misses 3653 3666 +13
- Partials 330 336 +6
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
|
||
| .PHONY: set-release-kind-downstream | ||
| set-release-kind-downstream: | ||
| ifeq ("", "$(CSV)") |
There was a problem hiding this comment.
This is for kind cluster deploy which doesn't use CSV
There was a problem hiding this comment.
ok, I have preserved behavior if there's no CSV it would just update env in noo controller deployment, is it incorrect?
There was a problem hiding this comment.
I think there's a confusion :-) It's not for KIND clusters, it's "release kind" like in "downstream kind of release"
| if [[ ! -z ${patch1+x} ]] ; then | ||
| oc patch csv $csv_name -n $namespace --type='json' -p "[$patch1, $patch2]" | ||
| else | ||
| oc patch csv $csv_name -n $namespace --type='json' -p "[$patch2]" |
There was a problem hiding this comment.
is this suppose to be patch1 ?
There was a problem hiding this comment.
so patch2 is what we want in all cases, patch1 is conditional depending upon whether rel_name is set patch1 var will be set.
| @@ -179,12 +179,15 @@ endif | |||
| @echo -e "\n==> Redeploying..." | |||
| kubectl rollout status -n $(OPERATOR_NS) --timeout=60s deployment netobserv-controller-manager | |||
| kubectl wait -n $(OPERATOR_NS) --timeout=60s --for condition=Available=True deployment netobserv-controller-manager | |||
| kubectl rollout status -n $(NAMESPACE) --timeout=60s deployment netobserv-plugin | |||
There was a problem hiding this comment.
did u intentionally remove those 2 lines ?
There was a problem hiding this comment.
yes, since it assumes netobserv-plugin is already deployed, while csv could be patched before any plugin is deployed and there would no netobserv-plugin deployment to check rollout status on. This is in line with what's currently in there for ebpf/flp make targets
There was a problem hiding this comment.
I'm good with that, this wasn't really useful actually
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: OlivierCazade 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 |
Description
Updating
swap-image-csv.shscript such that DOWNSTREAM_DEPLOYMENT env variable could be patched in CSV and minor fixes to set-plugin-image.Dependencies
n/a
Checklist
If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.