Merge branch 'fluentd-regression' into 'main'

fix fluentbit changes nixed fluentd setup.

See merge request weblogic-cloud/weblogic-kubernetes-operator!4579

Author: jshum2479

operator/src/main/java/oracle/kubernetes/operator/helpers/BasePodStepContext.java

@@ -221,10 +221,8 @@ protected V1ResourceRequirements createResources() {
   }
 
   protected V1PodSpec createPodSpec() {
-    return new V1PodSpec()
+    V1PodSpec podSpec = new V1PodSpec()
         .containers(getContainers())
-        .volumes(getFluentdVolumes())
-        .volumes(getFluentbitVolumes())
         .addContainersItem(createPrimaryContainer())
         .affinity(getServerSpec().getAffinity())
         .topologySpreadConstraints(getTopologySpreadConstraints())
@@ -239,6 +237,16 @@ protected V1PodSpec createPodSpec() {
         .restartPolicy(getServerSpec().getRestartPolicy())
         .securityContext(getPodSecurityContext())
         .imagePullSecrets(getServerSpec().getImagePullSecrets());
+
+    for (V1Volume additionalVolume : getFluentdVolumes()) {
+      podSpec.addVolumesItem(additionalVolume);
+    }
+
+    for (V1Volume additionalVolume : getFluentbitVolumes()) {
+      podSpec.addVolumesItem(additionalVolume);
+    }
+
+    return podSpec;
   }
 
   abstract V1PodSecurityContext getPodSecurityContext();

operator/src/test/java/oracle/kubernetes/operator/helpers/JobHelperTest.java

@@ -113,7 +113,9 @@
 import static oracle.kubernetes.operator.helpers.PodHelperTestBase.createSecretKeyRefEnvVar;
 import static oracle.kubernetes.operator.helpers.PodHelperTestBase.createSecurityContext;
 import static oracle.kubernetes.operator.helpers.PodHelperTestBase.createToleration;
+import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTBIT_CONFIGMAP_VOLUME;
 import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIGMAP_NAME_SUFFIX;
+import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIGMAP_VOLUME;
 import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONFIG_DATA_NAME;
 import static oracle.kubernetes.operator.helpers.StepContextConstants.FLUENTD_CONTAINER_NAME;
 import static oracle.kubernetes.operator.helpers.StepContextConstants.INIT_DOMAIN_ON_PV_CONTAINER;
@@ -500,6 +502,46 @@ void whenFluentdWatchIntrospectLogsEnable_jobPodShouldHaveFluentdSidecar() {
 
   }
 
+  @Test
+  void whenFluentdWatchIntrospectLogsEnable_jobPodShouldHaveFluentdVolume() {
+    configureDomain().withFluentdConfiguration(true, "dummy-cred",
+            null, null, null);
+
+    V1JobSpec jobSpec = createJobSpec();
+
+    Optional<Object> list  = Optional.ofNullable(jobSpec)
+            .map(V1JobSpec::getTemplate)
+            .map(V1PodTemplateSpec::getSpec)
+            .map(V1PodSpec::getVolumes)
+            .map(c -> c.isEmpty() ? null : c.stream().filter(v -> v.getName()
+                    .equals(FLUENTD_CONFIGMAP_VOLUME)).findAny().orElse(null));
+
+    assertThat(list, notNullValue());
+
+    assertThat(list, not(Optional.empty()));
+
+  }
+
+  @Test
+  void whenFluentbitWatchIntrospectLogsEnable_jobPodShouldHaveFluentbitVolume() {
+    configureDomain().withFluentbitConfiguration(true,"dummy-cred", "",
+            "", null,null);
+
+    V1JobSpec jobSpec = createJobSpec();
+
+    Optional<Object> list = Optional.ofNullable(jobSpec)
+            .map(V1JobSpec::getTemplate)
+            .map(V1PodTemplateSpec::getSpec)
+            .map(V1PodSpec::getVolumes)
+            .map(c -> c.isEmpty() ? null : c.stream().filter(v -> v.getName()
+                    .equals(FLUENTBIT_CONFIGMAP_VOLUME)).findAny().orElse(null));
+
+    assertThat(list, notNullValue());
+
+    assertThat(list, not(Optional.empty()));
+
+  }
+
   @Test
   void whenFluentdWatchIntrospectLogsDisable_jobPodShouldHaveFluentdSidecar() {
     configureDomain().withFluentdConfiguration(false, "dummy-cred",
@@ -516,6 +558,7 @@ void whenFluentdWatchIntrospectLogsDisable_jobPodShouldHaveFluentdSidecar() {
 
   }
 
+
   @Test
   void whenNoFluentdConfigmap_createIt() {
     configureDomain().withFluentdConfiguration(false, "dummy-cred",