search

netobserv / network-observability-operator

An OpenShift / Kubernetes operator for network observability
Apache License 2.0
133 stars 24 forks source link

force conflicts on deploy #689

Closed jotak closed 1 week ago

jotak commented 1 week ago

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[bot] commented 1 week ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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

Additional details and impacted files ```diff @@ 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](https://app.codecov.io/gh/netobserv/network-observability-operator/pull/689/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=netobserv) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/netobserv/network-observability-operator/pull/689/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=netobserv) | `66.05% <ø> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=netobserv#carryforward-flags-in-the-pull-request-comment) to find out more.
msherif1234 commented 1 week ago

/LGTM

jotak commented 1 week ago

thanks @msherif1234 /approve

openshift-ci[bot] commented 1 week ago

[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](https://github.com/netobserv/network-observability-operator/blob/main/OWNERS)~~ [jotak] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment