Merge branch 'fix-mount-conflicts-elkEnabled-42' into 'release/4.2'

fix-mount-conflicts-elkEnabled

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

Author: rjeberhard

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -154,8 +154,10 @@ spec:
           readOnly: true
         - name: "deployment-volume"
           mountPath: "/deployment"
+        {{- if not .elkIntegrationEnabled }}
         - name: "log-volume"
           mountPath: "/logs"
+        {{- end }}
         - name: "probes-volume"
           mountPath: "/probes"
         {{- if and .elkIntegrationEnabled .operatorLogPVC }}
@@ -220,8 +222,10 @@ spec:
           secretName: "weblogic-operator-secrets"
       - name: "deployment-volume"
         emptyDir: {}
+      {{- if not .elkIntegrationEnabled }}
       - name: "log-volume"
         emptyDir: {}
+      {{- end }}
       - name: "probes-volume"
         emptyDir: {}
       {{- if .elkIntegrationEnabled }}
@@ -419,8 +423,10 @@ spec:
               readOnly: true
             - name: "deployment-volume"
               mountPath: "/deployment"
+            {{- if not .elkIntegrationEnabled }}
             - name: "log-volume"
               mountPath: "/logs"
+            {{- end }}
             - name: "probes-volume"
               mountPath: "/probes"
             {{- if and .elkIntegrationEnabled .operatorLogPVC }}
@@ -480,8 +486,10 @@ spec:
               secretName: "weblogic-webhook-secrets"
           - name: "deployment-volume"
             emptyDir: {}
+          {{- if not .elkIntegrationEnabled }}
           - name: "log-volume"
             emptyDir: {}
+          {{- end }}
           - name: "probes-volume"
             emptyDir: {}
           {{- if .elkIntegrationEnabled }}

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

@@ -32,6 +32,8 @@
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceAccount;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
+import io.kubernetes.client.openapi.models.V1Volume;
+import io.kubernetes.client.openapi.models.V1VolumeMount;
 import oracle.kubernetes.operator.utils.GeneratedOperatorObjects;
 import oracle.kubernetes.operator.utils.KubernetesArtifactUtils;
 import oracle.kubernetes.operator.utils.OperatorValues;
@@ -197,7 +199,7 @@ private V1Deployment getActualWeblogicOperatorDeployment() {
   }
 
   protected V1Deployment getExpectedWeblogicOperatorDeployment() {
-    return newDeployment()
+    V1Deployment deployment = newDeployment()
         .metadata(
             newObjectMeta()
                 .name("weblogic-operator")
@@ -315,10 +317,6 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
                                             newVolumeMount()
                                                 .name("deployment-volume")
                                                 .mountPath("/deployment"))
-                                        .addVolumeMountsItem(
-                                            newVolumeMount()
-                                                .name("log-volume")
-                                                .mountPath("/logs"))
                                         .addVolumeMountsItem(
                                             newVolumeMount()
                                                 .name("probes-volume")
@@ -346,15 +344,22 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
                                     newVolume()
                                         .name("deployment-volume")
                                         .emptyDir(new V1EmptyDirVolumeSource()))
-                                .addVolumesItem(
-                                    newVolume()
-                                        .name("log-volume")
-                                        .emptyDir(new V1EmptyDirVolumeSource()))
                                 .addVolumesItem(
                                     newVolume()
                                         .name("probes-volume")
                                         .emptyDir(new V1EmptyDirVolumeSource()))
                         )));
+
+    boolean isElkIntegrationEnabled = Boolean.parseBoolean(getInputs().getElkIntegrationEnabled());
+    if (!isElkIntegrationEnabled) {
+      List<V1VolumeMount> mounts = deployment.getSpec().getTemplate().getSpec()
+          .getContainers().get(0).getVolumeMounts();
+      mounts.add(mounts.size() - 1, newVolumeMount().name("log-volume").mountPath("/logs"));
+      List<V1Volume> volumees = deployment.getSpec().getTemplate().getSpec().getVolumes();
+      volumees.add(volumees.size() - 1, newVolume().name("log-volume").emptyDir(new V1EmptyDirVolumeSource()));
+    }
+
+    return deployment;
   }
 
   void expectProbes(V1Container container) {