Fix issues with Micronaut and Kube acceptance tests (#16891)

* Fix issues with Micronaut and Kube acceptance tests

* Defer default bean creation until actually needed

Author: jdpgrailsdev

airbyte-workers/src/main/java/io/airbyte/workers/config/JobErrorReportingBeanFactory.java

@@ -16,6 +16,7 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
+import java.util.Optional;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -47,24 +48,14 @@ public JobErrorReportingClient loggingJobErrorReportingClient() {
     return new LoggingJobErrorReportingClient();
   }
 
-  @Singleton
-  @Requires(property = "airbyte.worker.job.error-reporting.strategy",
-            value = "")
-  @Requires(property = "airbyte.worker.plane",
-            notEquals = "DATA_PLANE")
-  @Named("jobErrorReportingClient")
-  public JobErrorReportingClient defaultJobErrorReportingClient() {
-    return loggingJobErrorReportingClient();
-  }
-
   @Singleton
   @Requires(property = "airbyte.worker.plane",
             notEquals = "DATA_PLANE")
   public JobErrorReporter jobErrorReporter(
                                            @Value("${airbyte.version}") final String airbyteVersion,
                                            final ConfigRepository configRepository,
                                            final DeploymentMode deploymentMode,
-                                           @Named("jobErrorReportingClient") final JobErrorReportingClient jobErrorReportingClient,
+                                           @Named("jobErrorReportingClient") final Optional<JobErrorReportingClient> jobErrorReportingClient,
                                            final WebUrlHelper webUrlHelper) {
     return new JobErrorReporter(
         configRepository,
@@ -73,7 +64,7 @@ public JobErrorReporter jobErrorReporter(
         NormalizationRunnerFactory.BASE_NORMALIZATION_IMAGE_NAME,
         NormalizationRunnerFactory.NORMALIZATION_VERSION,
         webUrlHelper,
-        jobErrorReportingClient);
+        jobErrorReportingClient.orElseGet(() -> new LoggingJobErrorReportingClient()));
   }
 
 }

kube/overlays/dev-integration-test/.env

@@ -72,6 +72,10 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
 CONTAINER_ORCHESTRATOR_ENABLED=true
 CONTAINER_ORCHESTRATOR_IMAGE=
 
+# Cloud Storage Configuration
+WORKER_LOGS_STORAGE_TYPE=MINIO
+WORKER_STATE_STORAGE_TYPE=MINIO
+
 # Open Telemetry Configuration
 METRIC_CLIENT=
 OTEL_COLLECTOR_ENDPOINT=

kube/overlays/dev/.env

@@ -74,6 +74,10 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
 CONTAINER_ORCHESTRATOR_ENABLED=true
 CONTAINER_ORCHESTRATOR_IMAGE=
 
+# Cloud Storage Configuration
+WORKER_LOGS_STORAGE_TYPE=MINIO
+WORKER_STATE_STORAGE_TYPE=MINIO
+
 # Open Telemetry Configuration
 METRIC_CLIENT=
 OTEL_COLLECTOR_ENDPOINT=

kube/overlays/stable-with-resource-limits/.env

@@ -70,6 +70,10 @@ CONTAINER_ORCHESTRATOR_ENABLED=true
 
 CONNECTOR_SPECIFIC_RESOURCE_DEFAULTS_ENABLED=true
 
+# Cloud Storage Configuration
+WORKER_LOGS_STORAGE_TYPE=MINIO
+WORKER_STATE_STORAGE_TYPE=MINIO
+
 # Open Telemetry Configuration
 METRIC_CLIENT=
 OTEL_COLLECTOR_ENDPOINT=

kube/overlays/stable/.env

@@ -74,6 +74,10 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
 CONTAINER_ORCHESTRATOR_ENABLED=true
 CONTAINER_ORCHESTRATOR_IMAGE=
 
+# Cloud Storage Configuration
+WORKER_LOGS_STORAGE_TYPE=MINIO
+WORKER_STATE_STORAGE_TYPE=MINIO
+
 # Open Telemetry Configuration
 METRIC_CLIENT=
 OTEL_COLLECTOR_ENDPOINT=

kube/resources/worker.yaml

@@ -285,6 +285,16 @@ spec:
                 configMapKeyRef:
                   name: airbyte-env
                   key: WORKERS_MICRONAUT_ENVIRONMENTS
+            - name: WORKER_LOGS_STORAGE_TYPE
+              valueFrom:
+                configMapKeyRef:
+                  name: airbyte-env
+                  key: WORKER_LOGS_STORAGE_TYPE
+            - name: WORKER_STATE_STORAGE_TYPE
+              valueFrom:
+                configMapKeyRef:
+                  name: airbyte-env
+                  key: WORKER_STATE_STORAGE_TYPE
           ports:
             - containerPort: 9000 # for heartbeat server
             - containerPort: 9001 # start temporal worker port pool