DBZ-5744 Add strimzi operator name as param

This commit is contained in:
Ondrej Babec 2022-10-20 09:47:43 +02:00 committed by Jiri Pechanec
parent ec8bac7069
commit 3fcbc25e2b
3 changed files with 5 additions and 1 deletions

View File

@ -56,6 +56,7 @@
<ocp.image.oracle>${docker.image.oracle}</ocp.image.oracle>
<!--Strimzi configuration-->
<strimzi.operator.name>strimzi-cluster-operator</strimzi.operator.name>
<strimzi.operator.connectors>true</strimzi.operator.connectors>
<strimzi.crd.version>v1beta2</strimzi.crd.version>
<strimzi.kc.build>true</strimzi.kc.build>
@ -471,6 +472,7 @@
<test.ocp.project.oracle>${ocp.project.oracle}</test.ocp.project.oracle>
<!--Strimzi Configuration-->
<test.strimzi.operator.name>${strimzi.operator.name}</test.strimzi.operator.name>
<test.strimzi.version.kafka>${version.strimzi.kafka}</test.strimzi.version.kafka>
<test.strimzi.operator.connectors>${strimzi.operator.connectors}</test.strimzi.operator.connectors>
<test.strimzi.crd.version>${strimzi.crd.version}</test.strimzi.crd.version>

View File

@ -50,6 +50,7 @@ private ConfigProperties() {
public static final Optional<String> OCP_PULL_SECRET_PATH = stringOptionalProperty("test.ocp.pull.secret.paths");
// Strimzi configuration
public static final String STRIMZI_OPERATOR_NAME = System.getProperty("test.strimzi.operator.name", "strimzi-cluster-operator");
public static final boolean STRIMZI_OPERATOR_CONNECTORS = booleanProperty("test.strimzi.operator.connectors", true);
public static final String STRIMZI_CRD_VERSION = System.getProperty("test.strimzi.crd.version", "v1beta2");
public static final String STRIMZI_VERSION_KAFKA = System.getProperty("test.strimzi.version.kafka", "3.1.0");

View File

@ -11,6 +11,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.debezium.testing.system.tools.ConfigProperties;
import io.debezium.testing.system.tools.OpenShiftUtils;
import io.debezium.testing.system.tools.OperatorController;
import io.fabric8.kubernetes.api.model.apps.Deployment;
@ -22,7 +23,7 @@
*/
public class StrimziOperatorController extends OperatorController {
private static final Logger LOGGER = LoggerFactory.getLogger(OcpKafkaController.class);
private static final String DEPLOYMENT_PREFIX = "strimzi-cluster-operator";
private static final String DEPLOYMENT_PREFIX = ConfigProperties.STRIMZI_OPERATOR_NAME;
private static final String DEPLOYMENT_PREFIX_OLM = "amq-streams-cluster-operator";
private static final Map<String, String> OPERATOR_LABELS = Map.of("strimzi.io/kind", "cluster-operator");