[ST] Remove usage of examples from our template classes and add namespaceName parameter

kube-state-metrics-values.yaml

@@ -0,0 +1,90 @@
+prometheus:
+  monitor:
+    enabled: true
+collectors: []
+extraArgs:
+  - --custom-resource-state-only=true
+rbac:
+  extraRules:
+    - apiGroups:
+        - kafka.strimzi.io
+      resources:
+        - kafkatopics
+        - kafkausers
+      verbs: [ "list", "watch" ]
+customResourceState:
+  enabled: true
+  config:
+    spec:
+      resources:
+        - groupVersionKind:
+            group: kafka.strimzi.io
+            version: v1beta2
+            kind: KafkaTopic
+          metricNamePrefix: strimzi_kafka_topic
+          metrics:
+            - name: "resource_info"
+              help: "The current state of a Strimzi kafka topic resource"
+              each:
+                type: Info
+                info:
+                  labelsFromPath:
+                    name: [ metadata, name ]
+              labelsFromPath:
+                exported_namespace: [ metadata, namespace ]
+                partitions: [ spec, partitions ]
+                replicas: [ spec, replicas ]
+                ready: [ status, conditions, "[type=Ready]", status ]
+                generation: [ status, observedGeneration ]
+                topicId: [ status, topicId ]
+                topicName: [ status, topicName ]
+        - groupVersionKind:
+            group: kafka.strimzi.io
+            version: v1beta2
+            kind: KafkaUser
+          metricNamePrefix: strimzi_kafka_user
+          metrics:
+            - name: "resource_info"
+              help: "The current state of a Strimzi kafka user resource"
+              each:
+                type: Info
+                info:
+                  labelsFromPath:
+                    name: [ metadata, name ]
+              labelsFromPath:
+                exported_namespace: [ metadata, namespace ]
+                ready: [ status, conditions, "[type=Ready]", status ]
+                deprecated: [ status, conditions, "[reason=DeprecatedFields]", type ]
+                secret: [ status, secret ]
+                generation: [ status, observedGeneration ]
+                username: [ status, username ]
+extraManifests:
+  - apiVersion: monitoring.coreos.com/v1
+    kind: PrometheusRule
+    metadata:
+      name: strimzi-kube-state-metrics
+    spec:
+      groups:
+        - name: strimzi-kube-state-metrics
+          rules:
+            - alert: KafkaUserDeprecated
+              expr: strimzi_kafka_user_resource_info{deprecated="Warning"}
+              for: 15m
+              labels:
+                severity: warning
+              annotations:
+                message: 'Strimzi Kafka User {{`{{ $labels.username }}`}} has a deprecated configuration'
+            - alert: KafkaUserNotReady
+              expr: strimzi_kafka_user_resource_info{ready!="True"}
+              for: 15m
+              labels:
+                severity: warning
+              annotations:
+                message: 'Strimzi Kafka User {{`{{ $labels.username }}`}} is not ready'
+            - alert: KafkaTopicNotReady
+              expr: strimzi_kafka_topic_resource_info{ready!="True"}
+              for: 15m
+              labels:
+                severity: warning
+              annotations:
+                message: 'Strimzi Kafka Topic {{`{{ $labels.topicName }}`}} is not ready'

systemtest/src/main/java/io/strimzi/systemtest/performance/utils/UserOperatorPerformanceUtils.java

@@ -87,15 +87,15 @@ public static List<KafkaUser> getListOfKafkaUsers(final TestStorage testStorage,
         for (int i = startPointer; i < endPointer; i++) {
             if (userAuthType.equals(UserAuthType.Tls)) {
                 usersList.add(
-                    KafkaUserTemplates.tlsUser(testStorage.getNamespaceName(), testStorage.getClusterName(), userName + "-" + i)
+                    KafkaUserTemplates.tlsUser(testStorage.getNamespaceName(), userName + "-" + i, testStorage.getClusterName())
                         .editOrNewSpec()
                             .withAuthorization(usersAcl)
                         .endSpec()
                         .build()
                 );
             } else {
                 usersList.add(
-                    KafkaUserTemplates.scramShaUser(testStorage.getNamespaceName(), testStorage.getClusterName(), userName + "-" + i)
+                    KafkaUserTemplates.scramShaUser(testStorage.getNamespaceName(), userName + "-" + i, testStorage.getClusterName())
                         .editOrNewSpec()
                             .withAuthorization(usersAcl)
                         .endSpec()

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

@@ -4,38 +4,32 @@
  */
 package io.strimzi.systemtest.templates.crd;
 
-import io.strimzi.api.kafka.model.bridge.KafkaBridge;
 import io.strimzi.api.kafka.model.bridge.KafkaBridgeBuilder;
-import io.strimzi.systemtest.TestConstants;
-import io.strimzi.systemtest.resources.ResourceManager;
-import io.strimzi.test.TestUtils;
 
 public class KafkaBridgeTemplates {
 
     private KafkaBridgeTemplates() {}
 
-    public static KafkaBridgeBuilder kafkaBridge(String name, String bootstrap, int kafkaBridgeReplicas) {
-        return kafkaBridge(name, name, bootstrap, kafkaBridgeReplicas);
-    }
-
-    public static KafkaBridgeBuilder kafkaBridge(String name, String clusterName, String bootstrap, int kafkaBridgeReplicas) {
-        KafkaBridge kafkaBridge = getKafkaBridgeFromYaml(TestConstants.PATH_TO_KAFKA_BRIDGE_CONFIG);
-        return defaultKafkaBridge(kafkaBridge, name, clusterName, bootstrap, kafkaBridgeReplicas);
-    }
+    private final static int DEFAULT_HTTP_PORT = 8080;
 
-    public static KafkaBridgeBuilder kafkaBridgeWithCors(String name, String bootstrap, int kafkaBridgeReplicas,
-                                                          String allowedCorsOrigin, String allowedCorsMethods) {
-        return kafkaBridgeWithCors(name, name, bootstrap, kafkaBridgeReplicas, allowedCorsOrigin, allowedCorsMethods);
+    public static KafkaBridgeBuilder kafkaBridge(
+        String namespaceName,
+        String bridgeName,
+        String bootstrap,
+        int kafkaBridgeReplicas
+    ) {
+        return defaultKafkaBridge(namespaceName, bridgeName, bootstrap, kafkaBridgeReplicas);
     }
 
-    public static KafkaBridgeBuilder kafkaBridgeWithCors(String name, String clusterName, String bootstrap,
-                                                  int kafkaBridgeReplicas, String allowedCorsOrigin,
-                                                  String allowedCorsMethods) {
-        KafkaBridge kafkaBridge = getKafkaBridgeFromYaml(TestConstants.PATH_TO_KAFKA_BRIDGE_CONFIG);
-
-        KafkaBridgeBuilder kafkaBridgeBuilder = defaultKafkaBridge(kafkaBridge, name, clusterName, bootstrap, kafkaBridgeReplicas);
-
-        kafkaBridgeBuilder
+    public static KafkaBridgeBuilder kafkaBridgeWithCors(
+        String namespaceName,
+        String bridgeName,
+        String bootstrap,
+        int kafkaBridgeReplicas,
+        String allowedCorsOrigin,
+        String allowedCorsMethods
+    ) {
+        return defaultKafkaBridge(namespaceName, bridgeName, bootstrap, kafkaBridgeReplicas)
             .editSpec()
                 .editHttp()
                     .withNewCors()
@@ -44,39 +38,40 @@ public static KafkaBridgeBuilder kafkaBridgeWithCors(String name, String cluster
                     .endCors()
                 .endHttp()
             .endSpec();
-
-        return kafkaBridgeBuilder;
     }
 
-    public static KafkaBridgeBuilder kafkaBridgeWithMetrics(String name, String clusterName, String bootstrap) {
-        return kafkaBridgeWithMetrics(name, clusterName, bootstrap, 1);
-    }
-
-    public static KafkaBridgeBuilder kafkaBridgeWithMetrics(String name, String clusterName, String bootstrap, int kafkaBridgeReplicas) {
-        KafkaBridge kafkaBridge = getKafkaBridgeFromYaml(TestConstants.PATH_TO_KAFKA_BRIDGE_CONFIG);
-
-        return defaultKafkaBridge(kafkaBridge, name, clusterName, bootstrap, kafkaBridgeReplicas)
+    public static KafkaBridgeBuilder kafkaBridgeWithMetrics(
+        String namespaceName,
+        String bridgeName,
+        String bootstrap,
+        int kafkaBridgeReplicas
+    ) {
+        return defaultKafkaBridge(namespaceName, bridgeName, bootstrap, kafkaBridgeReplicas)
             .editSpec()
                 .withEnableMetrics(true)
             .endSpec();
     }
 
-    private static KafkaBridgeBuilder defaultKafkaBridge(KafkaBridge kafkaBridge, String name, String kafkaClusterName, String bootstrap, int kafkaBridgeReplicas) {
-        return new KafkaBridgeBuilder(kafkaBridge)
+    private static KafkaBridgeBuilder defaultKafkaBridge(
+        String namespaceName,
+        String bridgeName,
+        String bootstrap,
+        int kafkaBridgeReplicas
+    ) {
+        return new KafkaBridgeBuilder()
             .withNewMetadata()
-                .withName(name)
-                .withNamespace(ResourceManager.kubeClient().getNamespace())
+                .withName(bridgeName)
+                .withNamespace(namespaceName)
             .endMetadata()
-            .editSpec()
+            .withNewSpec()
                 .withBootstrapServers(bootstrap)
                 .withReplicas(kafkaBridgeReplicas)
                 .withNewInlineLogging()
                     .addToLoggers("bridge.root.logger", "DEBUG")
                 .endInlineLogging()
+                .withNewHttp()
+                    .withPort(DEFAULT_HTTP_PORT)
+                .endHttp()
             .endSpec();
     }
-
-    private static KafkaBridge getKafkaBridgeFromYaml(String yamlPath) {
-        return TestUtils.configFromYaml(yamlPath, KafkaBridge.class);
-    }
 }

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

@@ -6,8 +6,8 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.strimzi.api.kafka.model.common.CertSecretSourceBuilder;
-import io.strimzi.api.kafka.model.connect.KafkaConnect;
 import io.strimzi.api.kafka.model.connect.KafkaConnectBuilder;
 import io.strimzi.api.kafka.model.connect.KafkaConnectResources;
 import io.strimzi.api.kafka.model.connect.build.DockerOutput;
@@ -25,88 +25,111 @@
 
 import java.util.Random;
 
-import static io.strimzi.test.k8s.KubeClusterResource.kubeClient;
-
 public class KafkaConnectTemplates {
 
     private static final Logger LOGGER = LogManager.getLogger(KafkaConnectTemplates.class);
 
-    private KafkaConnectTemplates() {}
-
-    public static KafkaConnectBuilder kafkaConnect(String name, final String namespaceName, String clusterName, int kafkaConnectReplicas, String pathToConnectConfig) {
-        KafkaConnect kafkaConnect = getKafkaConnectFromYaml(pathToConnectConfig);
-        return defaultKafkaConnect(kafkaConnect, namespaceName, name, clusterName, kafkaConnectReplicas);
-    }
+    private static final String METRICS_CONNECT_CONFIG_MAP_SUFFIX = "-connect-metrics";
+    private static final String CONFIG_MAP_KEY = "metrics-config.yml";
 
-    public static KafkaConnectBuilder kafkaConnect(String name, final String namespaceName, String clusterName, int kafkaConnectReplicas) {
-        return kafkaConnect(name, namespaceName, clusterName, kafkaConnectReplicas, TestConstants.PATH_TO_KAFKA_CONNECT_CONFIG);
-    }
+    private KafkaConnectTemplates() {}
 
-    public static KafkaConnectBuilder kafkaConnect(String name, final String namespaceName, int kafkaConnectReplicas) {
-        return kafkaConnect(name, namespaceName, name, kafkaConnectReplicas, TestConstants.PATH_TO_KAFKA_CONNECT_CONFIG);
+    public static KafkaConnectBuilder kafkaConnect(
+        final String namespaceName,
+        final String connectName,
+        String clusterName,
+        int kafkaConnectReplicas
+    ) {
+        return defaultKafkaConnect(namespaceName, connectName, clusterName, kafkaConnectReplicas);
     }
 
-    public static KafkaConnectBuilder kafkaConnectWithMetrics(String name, String namespaceName, int kafkaConnectReplicas) {
-        return kafkaConnectWithMetrics(name, namespaceName, name, kafkaConnectReplicas);
+    public static KafkaConnectBuilder kafkaConnect(
+        final String namespaceName,
+        String clusterName,
+        int kafkaConnectReplicas
+    ) {
+        return kafkaConnect(namespaceName, clusterName, clusterName, kafkaConnectReplicas);
     }
 
-    public static KafkaConnectBuilder kafkaConnectWithMetrics(String name, String namespaceName, String clusterName, int kafkaConnectReplicas) {
-        KafkaConnect kafkaConnect = getKafkaConnectFromYaml(TestConstants.PATH_TO_KAFKA_CONNECT_METRICS_CONFIG);
-        createOrReplaceConnectMetrics(namespaceName);
-        return defaultKafkaConnect(kafkaConnect, namespaceName, name, clusterName, kafkaConnectReplicas);
+    public static KafkaConnectBuilder kafkaConnectWithMetricsAndFileSinkPlugin(
+        String namespaceName,
+        String connectName,
+        String clusterName,
+        int replicas
+    ) {
+        return kafkaConnectWithFilePlugin(namespaceName, connectName, clusterName, replicas)
+            .editOrNewSpec()
+            .withNewJmxPrometheusExporterMetricsConfig()
+                .withNewValueFrom()
+                    .withNewConfigMapKeyRef(CONFIG_MAP_KEY, getConfigMapName(connectName), false)
+                .endValueFrom()
+            .endJmxPrometheusExporterMetricsConfig()
+            .endSpec();
     }
 
-    public static KafkaConnectBuilder kafkaConnectWithMetricsAndFileSinkPlugin(String name, String namespaceName, String clusterName, int replicas) {
-        createOrReplaceConnectMetrics(namespaceName);
-        return kafkaConnectWithFilePlugin(name, namespaceName, clusterName, replicas, TestConstants.PATH_TO_KAFKA_CONNECT_METRICS_CONFIG);
+    public static ConfigMap connectMetricsConfigMap(String namespaceName, String connectName) {
+        return new ConfigMapBuilder(TestUtils.configMapFromYaml(TestConstants.PATH_TO_KAFKA_CONNECT_METRICS_CONFIG, "connect-metrics"))
+            .editOrNewMetadata()
+                .withNamespace(namespaceName)
+                .withName(getConfigMapName(connectName))
+            .endMetadata()
+            .build();
     }
 
-    private static void createOrReplaceConnectMetrics(String namespaceName) {
-        ConfigMap metricsCm = TestUtils.configMapFromYaml(TestConstants.PATH_TO_KAFKA_CONNECT_METRICS_CONFIG, "connect-metrics");
-        kubeClient().createConfigMapInNamespace(namespaceName, metricsCm);
+    private static String getConfigMapName(String connectName) {
+        return connectName + METRICS_CONNECT_CONFIG_MAP_SUFFIX;
     }
 
-    private static KafkaConnectBuilder defaultKafkaConnect(KafkaConnect kafkaConnect, final String namespaceName, String name, String kafkaClusterName, int kafkaConnectReplicas) {
-        return new KafkaConnectBuilder(kafkaConnect)
+    private static KafkaConnectBuilder defaultKafkaConnect(
+        final String namespaceName,
+        String connectName,
+        String kafkaClusterName,
+        int kafkaConnectReplicas
+    ) {
+        return new KafkaConnectBuilder()
             .withNewMetadata()
-                .withName(name)
+                .withName(connectName)
                 .withNamespace(namespaceName)
             .endMetadata()
             .editOrNewSpec()
                 .withVersion(Environment.ST_KAFKA_VERSION)
                 .withBootstrapServers(KafkaResources.tlsBootstrapAddress(kafkaClusterName))
                 .withReplicas(kafkaConnectReplicas)
                 .withNewTls()
-                    .withTrustedCertificates(new CertSecretSourceBuilder().withSecretName(kafkaClusterName + "-cluster-ca-cert").withCertificate("ca.crt").build())
+                    .withTrustedCertificates(
+                        new CertSecretSourceBuilder()
+                            .withSecretName(KafkaResources.clusterCaCertificateSecretName(kafkaClusterName))
+                            .withCertificate("ca.crt")
+                            .build()
+                    )
                 .endTls()
-                .addToConfig("group.id", KafkaConnectResources.componentName(name))
-                .addToConfig("offset.storage.topic", KafkaConnectResources.configStorageTopicOffsets(name))
-                .addToConfig("config.storage.topic", KafkaConnectResources.metricsAndLogConfigMapName(name))
-                .addToConfig("status.storage.topic", KafkaConnectResources.configStorageTopicStatus(name))
+                .addToConfig("group.id", KafkaConnectResources.componentName(connectName))
+                .addToConfig("offset.storage.topic", KafkaConnectResources.configStorageTopicOffsets(connectName))
+                .addToConfig("config.storage.topic", KafkaConnectResources.metricsAndLogConfigMapName(connectName))
+                .addToConfig("status.storage.topic", KafkaConnectResources.configStorageTopicStatus(connectName))
+                .addToConfig("config.storage.replication.factor", "-1")
+                .addToConfig("offset.storage.replication.factor", "-1")
+                .addToConfig("status.storage.replication.factor", "-1")
                 .withNewInlineLogging()
                     .addToLoggers("connect.root.logger.level", "DEBUG")
                 .endInlineLogging()
             .endSpec();
     }
 
-    public static KafkaConnectBuilder kafkaConnectWithFilePlugin(String clusterName, String namespaceName, int replicas) {
-        return kafkaConnectWithFilePlugin(clusterName, namespaceName, clusterName, replicas);
-    }
-
-    public static KafkaConnectBuilder kafkaConnectWithFilePlugin(String name, String namespaceName, String clusterName, int replicas) {
-        return kafkaConnectWithFilePlugin(name, namespaceName, clusterName, replicas, TestConstants.PATH_TO_KAFKA_CONNECT_CONFIG);
+    public static KafkaConnectBuilder kafkaConnectWithFilePlugin(String namespaceName, String clusterName, int replicas) {
+        return kafkaConnectWithFilePlugin(namespaceName, clusterName, clusterName, replicas);
     }
 
     /**
      * Method for creating the KafkaConnect builder with File plugin - using the KafkaConnect build feature.
-     * @param name Name for the KafkaConnect resource
      * @param namespaceName namespace, where the KafkaConnect resource will be deployed
+     * @param connectName Name for the KafkaConnect resource
      * @param clusterName name of the Kafka cluster
      * @param replicas number of KafkaConnect replicas
      * @return KafkaConnect builder with File plugin
      */
-    public static KafkaConnectBuilder kafkaConnectWithFilePlugin(String name, String namespaceName, String clusterName, int replicas, String pathToConnectConfig) {
-        return addFileSinkPluginOrImage(namespaceName, kafkaConnect(name, namespaceName, clusterName, replicas, pathToConnectConfig));
+    public static KafkaConnectBuilder kafkaConnectWithFilePlugin(String namespaceName, String connectName, String clusterName, int replicas) {
+        return addFileSinkPluginOrImage(namespaceName, kafkaConnect(namespaceName, connectName, clusterName, replicas));
     }
 
     /**
@@ -166,8 +189,4 @@ public static DockerOutput dockerOutput(String imageName) {
 
         return dockerOutputBuilder.build();
     }
-
-    private static KafkaConnect getKafkaConnectFromYaml(String yamlPath) {
-        return TestUtils.configFromYaml(yamlPath, KafkaConnect.class);
-    }
 }