From 4092fb731bccd249f42a887ec765e3bbeb1679f4 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Mon, 16 Oct 2023 10:07:07 +0000 Subject: [PATCH] Remove usage of the operatorConfigInstall file, which was removed upstream --- common/src/main/java/io/brokerqe/claire/ArtemisConstants.java | 2 -- .../claire/operator/ArtemisCloudClusterOperatorFile.java | 1 - .../java/io/brokerqe/claire/operator/ArtemisFileProvider.java | 4 ---- 3 files changed, 7 deletions(-) diff --git a/common/src/main/java/io/brokerqe/claire/ArtemisConstants.java b/common/src/main/java/io/brokerqe/claire/ArtemisConstants.java index 97655c90..73436b14 100644 --- a/common/src/main/java/io/brokerqe/claire/ArtemisConstants.java +++ b/common/src/main/java/io/brokerqe/claire/ArtemisConstants.java @@ -137,7 +137,6 @@ public interface ArtemisConstants { String INSTALL_ARTEMIS_CO_070_NAMESPACE_ROLE_BINDING_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "namespace_role_binding.yaml"; String INSTALL_ARTEMIS_CO_080_ELECTION_ROLE_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "election_role.yaml"; String INSTALL_ARTEMIS_CO_090_ELECTION_ROLE_BINDING_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "election_role_binding.yaml"; - String INSTALL_ARTEMIS_CO_100_OPERATOR_CONFIG_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "operator_config.yaml"; String INSTALL_ARTEMIS_CO_110_OPERATOR_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "operator.yaml"; String EXAMPLE_ADDRESS_QUEUE_PATH = Constants.EXAMPLES_DIR_PATH + "address/address_queue.yaml"; String EXAMPLE_ADDRESS_TOPIC_PATH = Constants.EXAMPLES_DIR_PATH + "address/address_topic.yaml"; @@ -157,7 +156,6 @@ public interface ArtemisConstants { String OLD_INSTALL_ARTEMIS_CO_070_NAMESPACE_ROLE_BINDING_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "role_binding.yaml"; // 070_namespace_role_binding.yaml String OLD_INSTALL_ARTEMIS_CO_080_ELECTION_ROLE_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "election_role.yaml"; // 080_election_role.yaml String OLD_INSTALL_ARTEMIS_CO_090_ELECTION_ROLE_BINDING_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "election_role_binding.yaml"; // 090_election_role_binding.yaml - String OLD_INSTALL_ARTEMIS_CO_100_OPERATOR_CONFIG_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "operator_config.yaml"; // 100_operator_config.yaml String OLD_INSTALL_ARTEMIS_CO_110_OPERATOR_PATH = Constants.OPERATOR_INSTALL_DIR_PATH + "operator.yaml"; // 110_operator.yaml String OLD_EXAMPLE_ADDRESS_QUEUE_PATH = Constants.EXAMPLES_DIR_PATH + "address/address-queue-create.yaml"; // TODO alternative file does not exist? diff --git a/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java b/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java index 0ef1ba9d..dd71afb3 100644 --- a/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java +++ b/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisCloudClusterOperatorFile.java @@ -39,7 +39,6 @@ public class ArtemisCloudClusterOperatorFile extends ArtemisCloudClusterOperator ArtemisFileProvider.getServiceAccountInstallFile(), ArtemisFileProvider.getElectionRoleInstallFile(), ArtemisFileProvider.getElectionRoleBindingInstallFile(), - ArtemisFileProvider.getOperatorConfigInstallFile(), ArtemisFileProvider.getOperatorInstallFile() ); private List filesToDeploy; diff --git a/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisFileProvider.java b/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisFileProvider.java index 04eb5ca7..43c0f6cb 100644 --- a/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisFileProvider.java +++ b/operator-suite/src/main/java/io/brokerqe/claire/operator/ArtemisFileProvider.java @@ -62,10 +62,6 @@ public static Path getElectionRoleBindingInstallFile() { return getPresentFile(ArtemisConstants.INSTALL_ARTEMIS_CO_090_ELECTION_ROLE_BINDING_PATH, ArtemisConstants.OLD_INSTALL_ARTEMIS_CO_090_ELECTION_ROLE_BINDING_PATH); } - public static Path getOperatorConfigInstallFile() { - return getPresentFile(ArtemisConstants.INSTALL_ARTEMIS_CO_100_OPERATOR_CONFIG_PATH, ArtemisConstants.OLD_INSTALL_ARTEMIS_CO_100_OPERATOR_CONFIG_PATH); - } - public static Path getOperatorInstallFile() { return getPresentFile(ArtemisConstants.INSTALL_ARTEMIS_CO_110_OPERATOR_PATH, ArtemisConstants.OLD_INSTALL_ARTEMIS_CO_110_OPERATOR_PATH); }