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 #9270: Incorrect TO ResourceConflict message #9617

Merged
merged 2 commits into from Feb 1, 2024

Conversation

tombentley
Copy link
Member

Type of change

  • Bugfix

Description

Change BatchingTopicController#topics from being a Map<String, HashSet<KubeRef>> to Map<String, ArrayList<KubeRef>> so that the encounter order of KubRefs is maintained and the byCreationTime at the point we validate the single managing resource has a stable ordering in the presence of KafkaTopics with the same creationTimestamp.

Checklist

Please go through this checklist and make sure all applicable tasks have been done

  • Write tests
  • Make sure all tests pass
  • Update documentation
  • Check RBAC rights for Kubernetes / OpenShift roles
  • Try your changes from Pod inside your Kubernetes and OpenShift cluster, not just locally
  • Reference relevant issue(s) and close them after merging
  • Update CHANGELOG.md
  • Supply screenshots for visual changes, such as Grafana dashboards

Signed-off-by: Tom Bentley <tbentley@redhat.com>
Signed-off-by: Tom Bentley <tbentley@redhat.com>
Copy link
Contributor

@fvaleri fvaleri left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

This fixes #9270.

@tombentley tombentley merged commit d916d4d into strimzi:main Feb 1, 2024
13 checks passed
@tombentley tombentley deleted the TO-resource-conflict branch February 1, 2024 21:51
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.

None yet

3 participants