Skip to content
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

fix: skip update only if the conflict error is related to main output #492

Merged

Conversation

Unix4ever
Copy link
Member

Fix qtransform controller bug which was skipping the reconciliation if the conflict error is returned from the transformFunc and is related to the extra outputs.

Introduce a way to check if the error was raised by any particular resource type.

Copy link
Member

@smira smira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we need to apply same fix to state-etcd

@@ -253,7 +253,10 @@ func (ctrl *QController[Input, Output]) reconcileRunning(ctx context.Context, lo

return transformError
}); err != nil {
if state.IsConflictError(err) {
if state.IsConflictError(err,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is same in non-q transform/transform.go which can be updated as well

@Unix4ever
Copy link
Member Author

I guess we need to apply same fix to state-etcd

Yeah, I'm going to do it,

Fix `qtransform` controller bug which was skipping the reconciliation if
the conflict error is returned from the `transformFunc` and is related
to the extra outputs.

Introduce a way to check if the error was raised by any particular
resource type.

Signed-off-by: Artem Chernyshev <[email protected]>
@Unix4ever Unix4ever force-pushed the support-checking-resource-type-error branch from d0a84cb to c0a68e9 Compare September 12, 2024 11:24
@Unix4ever
Copy link
Member Author

/m

@talos-bot talos-bot merged commit c0a68e9 into cosi-project:main Sep 12, 2024
14 checks passed
Unix4ever added a commit to Unix4ever/omni that referenced this pull request Sep 12, 2024
Unix4ever added a commit to Unix4ever/omni that referenced this pull request Sep 12, 2024
Unix4ever added a commit to siderolabs/omni that referenced this pull request Sep 17, 2024
See: cosi-project/runtime#492

Signed-off-by: Artem Chernyshev <[email protected]>
(cherry picked from commit 4c329db)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants