force conflicts on deploy

[jotak]

with kubectl apply --server-side, sometimes we get conflict errors, such as after using the make target set-xxx-image which amends the deployment env variables. Using --force-conflicts allows to ignore such conflict, and makes the new deployment prevail.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.05%. Comparing base (66c7a62) to head (c3d2db6).
Report is 3 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #689   +/-   ##
=======================================
  Coverage   66.05%   66.05%           
=======================================
  Files          70       70           
  Lines        8186     8186           
=======================================
  Hits         5407     5407           
  Misses       2383     2383           
  Partials      396      396           

Flag	Coverage Δ
unittests	66.05% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

[msherif1234]

/LGTM

[jotak]

thanks @msherif1234
/approve

[openshift-ci]

[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:

• OWNERS [jotak]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment