Remove reduntant deprecation supressions from System Tests (#12614)

Signed-off-by: Jakub Scholz <www@scholzj.com>

Author: scholzj

systemtest/src/test/java/io/strimzi/systemtest/cruisecontrol/CruiseControlST.java

@@ -289,7 +289,6 @@ void testCruiseControlChangesFromRebalancingtoProposalReadyWhenSpecUpdated() {
             @Label(value = TestDocsLabels.CRUISE_CONTROL),
         }
     )
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     void testCruiseControlWithSingleNodeKafka() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
 
@@ -506,7 +505,6 @@ void testCruiseControlIntraBrokerBalancing() {
             @Label(value = TestDocsLabels.CRUISE_CONTROL),
         }
     )
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     void testCruiseControlDuringBrokerScaleUpAndDown() {
         TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext(), TestConstants.CO_NAMESPACE);
         final int initialReplicas = 3;
@@ -648,7 +646,6 @@ void testKafkaRebalanceAutoApprovalMechanism() {
             @Label(value = TestDocsLabels.CRUISE_CONTROL),
         }
     )
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     void testAutoKafkaRebalanceScaleUpScaleDown() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
         final String scaleUpKafkaRebalanceTemplateName = testStorage.getClusterName() + "-scale-up";

systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaST.java

@@ -376,7 +376,6 @@ void testRemoveComponentsFromEntityOperator() {
             @Label(value = TestDocsLabels.KAFKA)
         }
     )
-    @SuppressWarnings("deprecation") // Storage is deprecated, but some API methods are still called here
     void testKafkaJBODDeleteClaimsTrueFalse() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
         final int kafkaReplicas = 2;
@@ -398,13 +397,7 @@ void testKafkaJBODDeleteClaimsTrueFalse() {
             KafkaNodePoolTemplates.controllerPool(testStorage.getNamespaceName(), testStorage.getControllerPoolName(), testStorage.getClusterName(), kafkaReplicas).build()
         );
 
-        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), kafkaReplicas)
-            .editSpec()
-                .editKafka()
-                    .withStorage(jbodStorage)
-                .endKafka()
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), kafkaReplicas).build());
 
         Map<String, String> brokerPods = PodUtils.podSnapshot(testStorage.getNamespaceName(), testStorage.getBrokerSelector());
         // kafka cluster already deployed
@@ -1041,7 +1034,6 @@ void testDeployUnsupportedKafka() {
             @Label(value = TestDocsLabels.KAFKA)
         }
     )
-    @SuppressWarnings("deprecation") // Storage is deprecated, but some API methods are still called here
     void testResizeJbodVolumes() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
         final int numberOfKafkaReplicas = 3;
@@ -1065,17 +1057,7 @@ void testResizeJbodVolumes() {
                 .build(),
             KafkaNodePoolTemplates.controllerPoolPersistentStorage(testStorage.getNamespaceName(), testStorage.getControllerPoolName(), testStorage.getClusterName(), 3).build()
         );
-        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), numberOfKafkaReplicas)
-            .editSpec()
-                .editKafka()
-                    .withStorage(
-                        new JbodStorageBuilder()
-                            // add two small volumes
-                            .addToVolumes(vol0, vol1)
-                            .build())
-                .endKafka()
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), numberOfKafkaReplicas).build());
 
         KubeResourceManager.get().createResourceWithWait(KafkaTopicTemplates.topic(testStorage).build());
 

systemtest/src/test/java/io/strimzi/systemtest/operators/MultipleClusterOperatorsST.java

@@ -251,7 +251,6 @@ void testMultipleCOsInDifferentNamespaces() {
      */
     @IsolatedTest
     @Tag(CRUISE_CONTROL)
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     void testKafkaCCAndRebalanceWithMultipleCOs() {
         assumeFalse(Environment.isNamespaceRbacScope());
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext(), DEFAULT_NAMESPACE);

systemtest/src/test/java/io/strimzi/systemtest/operators/ReconciliationST.java

@@ -63,7 +63,6 @@ public class ReconciliationST extends AbstractST {
     @ParallelNamespaceTest
     @Tag(CONNECT)
     @Tag(CONNECT_COMPONENTS)
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     @TestDoc(
         description = @Desc("This test verifies that pause reconciliation annotation prevents changes from being applied to `Kafka`, `KafkaConnect`, and `KafkaConnector` resources, and that resuming reconciliation applies pending changes."),
         steps = {

systemtest/src/test/java/io/strimzi/systemtest/rollingupdate/AlternativeReconcileTriggersST.java

@@ -334,7 +334,6 @@ void testManualRollingUpdateForSinglePod() {
      *  - persistent-volume-claims
      */
     @ParallelNamespaceTest
-    @SuppressWarnings("deprecation") // Storage is deprecated, but some API methods are still called here
     void testAddingAndRemovingJbodVolumes() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
 
@@ -352,13 +351,7 @@ void testAddingAndRemovingJbodVolumes() {
                 .build(),
             KafkaNodePoolTemplates.controllerPoolPersistentStorage(testStorage.getNamespaceName(), testStorage.getControllerPoolName(), testStorage.getClusterName(), 3).build()
         );
-        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), 3)
-            .editSpec()
-                .editKafka()
-                    .withStorage(new JbodStorageBuilder().addToVolumes(vol0).build())
-                .endKafka()
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), 3).build());
 
         Map<String, String> brokerPods = PodUtils.podSnapshot(testStorage.getNamespaceName(), testStorage.getBrokerSelector());
 
@@ -466,7 +459,6 @@ void testAddingAndRemovingJbodVolumes() {
      * - KRaft metadata log
      */
     @ParallelNamespaceTest
-    @SuppressWarnings("deprecation") // Storage is deprecated, but some API methods are still called here
     void testJbodMetadataLogRelocation() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
         final int numberOfKafkaReplicas = 3;
@@ -492,16 +484,7 @@ void testJbodMetadataLogRelocation() {
                 .build(),
             KafkaNodePoolTemplates.controllerPoolPersistentStorage(testStorage.getNamespaceName(), testStorage.getControllerPoolName(), testStorage.getClusterName(), 3).build()
         );
-        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), numberOfKafkaReplicas)
-            .editSpec()
-                .editKafka()
-                    .withStorage(
-                        new JbodStorageBuilder()
-                            .addToVolumes(vol, otherVol, metadataVol)
-                            .build())
-                .endKafka()
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(testStorage.getNamespaceName(), testStorage.getClusterName(), numberOfKafkaReplicas).build());
 
         KubeResourceManager.get().createResourceWithWait(KafkaTopicTemplates.topic(testStorage).build());
 

systemtest/src/test/java/io/strimzi/systemtest/rollingupdate/KafkaRollerST.java

@@ -78,7 +78,6 @@ public class KafkaRollerST extends AbstractST {
     private static final Logger LOGGER = LogManager.getLogger(KafkaRollerST.class);
 
     @ParallelNamespaceTest
-    @SuppressWarnings("deprecation") // Replicas in Kafka CR are deprecated, but some API methods are still called here
     void testKafkaDoesNotRollsWhenTopicIsUnderReplicated() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
         Instant startTime = Instant.now();