From a4f2a60bf1f854a7efe84a364ac6f34f4e230c41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:41:28 +0000 Subject: [PATCH 1/2] build(deps): bump io.strimzi:api from 0.44.0 to 0.45.0 in /api Bumps [io.strimzi:api](https://github.com/strimzi/strimzi-kafka-operator) from 0.44.0 to 0.45.0. - [Release notes](https://github.com/strimzi/strimzi-kafka-operator/releases) - [Changelog](https://github.com/strimzi/strimzi-kafka-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/strimzi/strimzi-kafka-operator/compare/0.44.0...0.45.0) --- updated-dependencies: - dependency-name: io.strimzi:api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd6d97b49..719deb0b3 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ quarkus-bom io.quarkus.platform 3.15.2 - 0.44.0 + 0.45.0 0.15.0 2.6.6.Final From cdca9b57b5ea31d2415e450ca30b9c4546a93127 Mon Sep 17 00:00:00 2001 From: Michael Edgar Date: Mon, 23 Dec 2024 08:21:28 -0500 Subject: [PATCH 2/2] fix: remove workaround from #1267 Signed-off-by: Michael Edgar --- .../com/github/streamshub/console/test/TestHelper.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/api/src/test/java/com/github/streamshub/console/test/TestHelper.java b/api/src/test/java/com/github/streamshub/console/test/TestHelper.java index c4be837a0..eff96acab 100644 --- a/api/src/test/java/com/github/streamshub/console/test/TestHelper.java +++ b/api/src/test/java/com/github/streamshub/console/test/TestHelper.java @@ -30,7 +30,6 @@ import io.strimzi.api.kafka.model.kafka.KafkaBuilder; import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerAuthentication; import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType; -import io.strimzi.api.kafka.model.topic.KafkaTopic; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.fail; @@ -125,14 +124,7 @@ public Kafka buildKafkaResource(String name, String id, URI bootstrapServers, Ka } public > C apply(KubernetesClient client, C resource) { - C response = client.resource(resource).serverSideApply(); - /* - * Skip status patch for KafkaTopic before Strimzi 0.45. - * https://github.com/strimzi/strimzi-kafka-operator/issues/10905 - */ - if (response instanceof KafkaTopic) { - return response; - } + client.resource(resource).serverSideApply(); return client.resource(resource).patchStatus(); }