Remove use of deprecated enableMetrics field in Bridge STs (#12096)

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

Author: scholzj

systemtest/src/main/java/io/strimzi/systemtest/TestConstants.java

@@ -201,6 +201,7 @@ public interface TestConstants {
     String PATH_TO_KAFKA_CONNECT_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/connect/kafka-connect.yaml";
     String PATH_TO_KAFKA_CONNECT_METRICS_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/metrics/kafka-connect-metrics.yaml";
     String PATH_TO_KAFKA_BRIDGE_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/bridge/kafka-bridge.yaml";
+    String PATH_TO_KAFKA_BRIDGE_METRICS_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/metrics/kafka-bridge-metrics.yaml";
     String PATH_TO_KAFKA_REBALANCE_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/cruise-control/kafka-rebalance-full.yaml";
     String PATH_TO_KAFKA_CRUISE_CONTROL_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/cruise-control/kafka-cruise-control.yaml";
     String PATH_TO_KAFKA_CRUISE_CONTROL_METRICS_CONFIG = PATH_TO_PACKAGING_EXAMPLES + "/metrics/kafka-cruise-control-metrics.yaml";

systemtest/src/main/java/io/strimzi/systemtest/templates/crd/KafkaBridgeTemplates.java

@@ -4,9 +4,15 @@
  */
 package io.strimzi.systemtest.templates.crd;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.strimzi.api.kafka.model.bridge.KafkaBridgeBuilder;
+import io.strimzi.systemtest.TestConstants;
+import io.strimzi.systemtest.utils.FileUtils;
 
 public class KafkaBridgeTemplates {
+    private static final String METRICS_BRIDGE_CONFIG_MAP_SUFFIX = "-bridge-metrics";
+    private static final String CONFIG_MAP_KEY = "metrics-config.yml";
 
     private KafkaBridgeTemplates() {}
 
@@ -48,10 +54,27 @@ public static KafkaBridgeBuilder kafkaBridgeWithMetrics(
     ) {
         return defaultKafkaBridge(namespaceName, bridgeName, bootstrap, kafkaBridgeReplicas)
             .editSpec()
-                .withEnableMetrics(true)
+                .withNewJmxPrometheusExporterMetricsConfig()
+                    .withNewValueFrom()
+                        .withNewConfigMapKeyRef(CONFIG_MAP_KEY, getConfigMapName(bridgeName), false)
+                    .endValueFrom()
+                .endJmxPrometheusExporterMetricsConfig()
             .endSpec();
     }
 
+    public static ConfigMap bridgeMetricsConfigMap(String namespaceName, String bridgeName) {
+        return new ConfigMapBuilder(FileUtils.extractConfigMapFromYAMLWithResources(TestConstants.PATH_TO_KAFKA_BRIDGE_METRICS_CONFIG, "bridge-metrics"))
+            .editOrNewMetadata()
+                .withNamespace(namespaceName)
+                .withName(getConfigMapName(bridgeName))
+            .endMetadata()
+            .build();
+    }
+
+    private static String getConfigMapName(String kafkaConnectClusterName) {
+        return kafkaConnectClusterName + METRICS_BRIDGE_CONFIG_MAP_SUFFIX;
+    }
+
     private static KafkaBridgeBuilder defaultKafkaBridge(
         String namespaceName,
         String bridgeName,

systemtest/src/test/java/io/strimzi/systemtest/metrics/MetricsST.java

@@ -453,12 +453,13 @@ void testKafkaBridgeMetrics() {
         final TestStorage testStorage = new TestStorage(KubeResourceManager.get().getTestContext());
 
         KubeResourceManager.get().createResourceWithWait(
-            KafkaBridgeTemplates.kafkaBridgeWithMetrics(
-                namespaceFirst,
-                bridgeClusterName,
-                KafkaResources.plainBootstrapAddress(kafkaClusterFirstName),
-                1
-                ).build()
+                KafkaBridgeTemplates.bridgeMetricsConfigMap(namespaceFirst, bridgeClusterName),
+                KafkaBridgeTemplates.kafkaBridgeWithMetrics(
+                        namespaceFirst,
+                        bridgeClusterName,
+                        KafkaResources.plainBootstrapAddress(kafkaClusterFirstName),
+                        1
+                        ).build()
         );
 
         // Allow connections from scraper to Bridge pods when NetworkPolicies are set to denied by default

systemtest/src/test/java/io/strimzi/systemtest/security/oauth/CustomOauthPlainST.java

@@ -509,24 +509,27 @@ void testProducerConsumerBridgeWithOauthMetrics() {
                 "oauth.enable.metrics", "true"
         ));
 
-        KubeResourceManager.get().createResourceWithWait(KafkaBridgeTemplates.kafkaBridgeWithMetrics(Environment.TEST_SUITE_NAMESPACE, oauthClusterName, KafkaResources.plainBootstrapAddress(oauthClusterName), 1)
-            .editSpec()
-                .withNewKafkaClientAuthenticationCustom()
-                    .withSasl(true)
-                    .withConfig(Map.of(
-                            "sasl.login.callback.handler.class", "io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler",
-                            "sasl.mechanism", "OAUTHBEARER",
-                            "sasl.jaas.config", bridgeJassConfig
-                    ))
-                .endKafkaClientAuthenticationCustom()
-                .withNewTemplate()
-                    .withNewBridgeContainer()
-                        .withEnv(new ContainerEnvVarBuilder().withName("OAUTH_CLIENT_SECRET").withValueFrom(new ContainerEnvVarSourceBuilder().withNewSecretKeyRef(OAUTH_KEY, BRIDGE_OAUTH_SECRET, false).build()).build())
-                    .endBridgeContainer()
-                .endTemplate()
-                .withLogging(ilDebug)
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(
+                KafkaBridgeTemplates.bridgeMetricsConfigMap(Environment.TEST_SUITE_NAMESPACE, oauthClusterName),
+                KafkaBridgeTemplates.kafkaBridgeWithMetrics(Environment.TEST_SUITE_NAMESPACE, oauthClusterName, KafkaResources.plainBootstrapAddress(oauthClusterName), 1)
+                        .editSpec()
+                            .withNewKafkaClientAuthenticationCustom()
+                                .withSasl(true)
+                                .withConfig(Map.of(
+                                        "sasl.login.callback.handler.class", "io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler",
+                                        "sasl.mechanism", "OAUTHBEARER",
+                                        "sasl.jaas.config", bridgeJassConfig
+                                ))
+                            .endKafkaClientAuthenticationCustom()
+                            .withNewTemplate()
+                                .withNewBridgeContainer()
+                                    .withEnv(new ContainerEnvVarBuilder().withName("OAUTH_CLIENT_SECRET").withValueFrom(new ContainerEnvVarSourceBuilder().withNewSecretKeyRef(OAUTH_KEY, BRIDGE_OAUTH_SECRET, false).build()).build())
+                                .endBridgeContainer()
+                            .endTemplate()
+                            .withLogging(ilDebug)
+                        .endSpec()
+                        .build()
+        );
 
         // Allow connections from scraper to Bridge pods when NetworkPolicies are set to denied by default
         NetworkPolicyUtils.allowNetworkPolicySettingsForBridgeScraper(Environment.TEST_SUITE_NAMESPACE, scraperPodName, KafkaBridgeResources.componentName(oauthClusterName));

systemtest/src/test/java/io/strimzi/systemtest/security/oauth/OauthPlainST.java

@@ -561,22 +561,25 @@ void testProducerConsumerBridgeWithOauthMetrics() {
         InlineLogging ilDebug = new InlineLogging();
         ilDebug.setLoggers(Map.of("rootLogger.level", "DEBUG"));
 
-        KubeResourceManager.get().createResourceWithWait(KafkaBridgeTemplates.kafkaBridgeWithMetrics(Environment.TEST_SUITE_NAMESPACE, oauthClusterName, KafkaResources.plainBootstrapAddress(oauthClusterName), 1)
-            .editSpec()
-                .withNewKafkaClientAuthenticationOAuth()
-                    .withEnableMetrics()
-                    .withTokenEndpointUri(keycloakInstance.getOauthTokenEndpointUri())
-                    .withClientId("kafka-bridge")
-                    .withNewClientSecret()
-                        .withSecretName(BRIDGE_OAUTH_SECRET)
-                        .withKey(OAUTH_KEY)
-                    .endClientSecret()
-                    .withConnectTimeoutSeconds(CONNECT_TIMEOUT_S)
-                    .withReadTimeoutSeconds(READ_TIMEOUT_S)
-                .endKafkaClientAuthenticationOAuth()
-                .withLogging(ilDebug)
-            .endSpec()
-            .build());
+        KubeResourceManager.get().createResourceWithWait(
+                KafkaBridgeTemplates.bridgeMetricsConfigMap(Environment.TEST_SUITE_NAMESPACE, oauthClusterName),
+                KafkaBridgeTemplates.kafkaBridgeWithMetrics(Environment.TEST_SUITE_NAMESPACE, oauthClusterName, KafkaResources.plainBootstrapAddress(oauthClusterName), 1)
+                        .editSpec()
+                            .withNewKafkaClientAuthenticationOAuth()
+                                .withEnableMetrics()
+                                .withTokenEndpointUri(keycloakInstance.getOauthTokenEndpointUri())
+                                .withClientId("kafka-bridge")
+                                .withNewClientSecret()
+                                    .withSecretName(BRIDGE_OAUTH_SECRET)
+                                    .withKey(OAUTH_KEY)
+                                .endClientSecret()
+                                .withConnectTimeoutSeconds(CONNECT_TIMEOUT_S)
+                                .withReadTimeoutSeconds(READ_TIMEOUT_S)
+                            .endKafkaClientAuthenticationOAuth()
+                            .withLogging(ilDebug)
+                        .endSpec()
+                        .build()
+        );
 
         // Allow connections from scraper to Bridge pods when NetworkPolicies are set to denied by default
         NetworkPolicyUtils.allowNetworkPolicySettingsForBridgeScraper(Environment.TEST_SUITE_NAMESPACE, scraperPodName, KafkaBridgeResources.componentName(oauthClusterName));