Created
October 19, 2020 10:25
-
-
Save b1zzu/28a1d17f07c378559985a6457fbe021a to your computer and use it in GitHub Desktop.
Patch to fix the deployment name
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java | |
| index 86615a4e6..12598bcf3 100644 | |
| --- a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java | |
| +++ b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java | |
| @@ -68,6 +68,7 @@ public class Environment { | |
| * OLM env variables | |
| */ | |
| private static final String OLM_OPERATOR_NAME_ENV = "OLM_OPERATOR_NAME"; | |
| + private static final String OLM_OPERATOR_DEPLOYMENT_NAME_ENV = "OLM_OPERATOR_DEPLOYMENT_NAME"; | |
| private static final String OLM_SOURCE_NAME_ENV = "OLM_SOURCE_NAME"; | |
| private static final String OLM_APP_BUNDLE_PREFIX_ENV = "OLM_APP_BUNDLE_PREFIX"; | |
| private static final String OLM_OPERATOR_VERSION_ENV = "OLM_OPERATOR_VERSION"; | |
| @@ -118,6 +119,7 @@ public class Environment { | |
| public static final String OPERATOR_IMAGE_PULL_POLICY = System.getenv().getOrDefault(OPERATOR_IMAGE_PULL_POLICY_ENV, OPERATOR_IMAGE_PULL_POLICY_ENV_DEFAULT); | |
| // OLM env variables | |
| public static final String OLM_OPERATOR_NAME = System.getenv().getOrDefault(OLM_OPERATOR_NAME_ENV, OLM_OPERATOR_NAME_DEFAULT); | |
| + public static final String OLM_OPERATOR_DEPLOYMENT_NAME = System.getenv().getOrDefault(OLM_OPERATOR_DEPLOYMENT_NAME_ENV, OLM_OPERATOR_NAME_DEFAULT); | |
| public static final String OLM_SOURCE_NAME = System.getenv().getOrDefault(OLM_SOURCE_NAME_ENV, OLM_SOURCE_NAME_DEFAULT); | |
| public static final String OLM_APP_BUNDLE_PREFIX = System.getenv().getOrDefault(OLM_APP_BUNDLE_PREFIX_ENV, OLM_APP_BUNDLE_PREFIX_DEFAULT); | |
| public static final String OLM_OPERATOR_VERSION = System.getenv().getOrDefault(OLM_OPERATOR_VERSION_ENV, OLM_OPERATOR_VERSION_DEFAULT); | |
| diff --git a/systemtest/src/main/java/io/strimzi/systemtest/resources/operator/OlmResource.java b/systemtest/src/main/java/io/strimzi/systemtest/resources/operator/OlmResource.java | |
| index 3fb52274e..05e69dc18 100644 | |
| --- a/systemtest/src/main/java/io/strimzi/systemtest/resources/operator/OlmResource.java | |
| +++ b/systemtest/src/main/java/io/strimzi/systemtest/resources/operator/OlmResource.java | |
| @@ -61,8 +61,8 @@ public class OlmResource { | |
| ResourceManager.cmdKubeClient().apply(subscriptionFile); | |
| // Make sure that operator will be deleted | |
| TestUtils.waitFor("Cluster Operator deployment creation", Constants.GLOBAL_POLL_INTERVAL, CR_CREATION_TIMEOUT, | |
| - () -> ResourceManager.kubeClient().getDeploymentNameByPrefix(Environment.OLM_OPERATOR_NAME) != null); | |
| - String deploymentName = ResourceManager.kubeClient().getDeploymentNameByPrefix(Environment.OLM_OPERATOR_NAME); | |
| + () -> ResourceManager.kubeClient().getDeploymentNameByPrefix(Environment.OLM_OPERATOR_DEPLOYMENT_NAME) != null); | |
| + String deploymentName = ResourceManager.kubeClient().getDeploymentNameByPrefix(Environment.OLM_OPERATOR_DEPLOYMENT_NAME); | |
| ResourceManager.setCoDeploymentName(deploymentName); | |
| ResourceManager.getPointerResources().push(() -> deleteOlm(deploymentName, namespace, csvName)); | |
| // Wait for operator creation |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment