Reduce wait times and only add JAVA_OPTS_APPEND to the list of env va…

…rs if it has a value
Apicurio · Feb 13, 2025 · 0c72719 · 0c72719
1 parent 3ba8133
commit 0c72719
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java b/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java
@@ -114,7 +114,9 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
                 });
 
         // Set the JAVA_OPTS_APPEND env var that may have been built up
-        envVars.put(EnvironmentVariables.JAVA_OPTS_APPEND, javaOptsAppend.toEnvVar());
+        if (!javaOptsAppend.isEmpty()) {
+            envVars.put(EnvironmentVariables.JAVA_OPTS_APPEND, javaOptsAppend.toEnvVar());
+        }
 
         // Set the ENV VARs on the deployment's container spec.
         var container = getContainerFromDeployment(deployment, REGISTRY_APP_CONTAINER_NAME);

diff --git a/operator/controller/src/test/java/io/apicurio/registry/operator/it/ITBase.java b/operator/controller/src/test/java/io/apicurio/registry/operator/it/ITBase.java
@@ -118,46 +118,46 @@ public void beforeEach(TestInfo testInfo) {
     }
 
     protected static void checkDeploymentExists(ApicurioRegistry3 primary, String component, int replicas) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.apps().deployments()
                     .withName(primary.getMetadata().getName() + "-" + component + "-deployment").get()
                     .getStatus().getReadyReplicas()).isEqualTo(replicas);
         });
     }
 
     protected static void checkDeploymentDoesNotExist(ApicurioRegistry3 primary, String component) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.apps().deployments()
                     .withName(primary.getMetadata().getName() + "-" + component + "-deployment").get())
                     .isNull();
         });
     }
 
     protected static void checkServiceExists(ApicurioRegistry3 primary, String component) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.services()
                     .withName(primary.getMetadata().getName() + "-" + component + "-service").get())
                     .isNotNull();
         });
     }
 
     protected static void checkServiceDoesNotExist(ApicurioRegistry3 primary, String component) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.services()
                     .withName(primary.getMetadata().getName() + "-" + component + "-service").get()).isNull();
         });
     }
 
     protected static void checkIngressExists(ApicurioRegistry3 primary, String component) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.network().v1().ingresses()
                     .withName(primary.getMetadata().getName() + "-" + component + "-ingress").get())
                     .isNotNull();
         });
     }
 
     protected static void checkIngressDoesNotExist(ApicurioRegistry3 primary, String component) {
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             assertThat(client.network().v1().ingresses()
                     .withName(primary.getMetadata().getName() + "-" + component + "-ingress").get()).isNull();
         });
@@ -167,7 +167,7 @@ protected static PodDisruptionBudget checkPodDisruptionBudgetExists(ApicurioRegi
             String component) {
         final ValueOrNull<PodDisruptionBudget> rval = new ValueOrNull<>();
 
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             PodDisruptionBudget pdb = client.policy().v1().podDisruptionBudget()
                     .withName(primary.getMetadata().getName() + "-" + component + "-poddisruptionbudget")
                     .get();
@@ -181,7 +181,7 @@ protected static PodDisruptionBudget checkPodDisruptionBudgetExists(ApicurioRegi
     protected static NetworkPolicy checkNetworkPolicyExists(ApicurioRegistry3 primary, String component) {
         final ValueOrNull<NetworkPolicy> rval = new ValueOrNull<>();
 
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             NetworkPolicy networkPolicy = client.network().v1().networkPolicies()
                     .withName(primary.getMetadata().getName() + "-" + component + "-networkpolicy").get();
             assertThat(networkPolicy).isNotNull();
@@ -220,7 +220,7 @@ private static void createTestResources() throws Exception {
 
     private static void startOperatorLogs() {
         List<Pod> operatorPods = new ArrayList<>();
-        await().ignoreExceptions().untilAsserted(() -> {
+        await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
             operatorPods.clear();
             operatorPods.addAll(client.pods()
                     .withLabels(Map.of(